Snap for 6290619 from 57103f7e0c1e913bc205b0bc2ce1a39db7b59a1d to sdk-release

Change-Id: Idb2b29f2b18b34e0daeff36e5696143aef4de456