Snap for 5735642 from 0f3297fadccd81ea9f6f76e45757c378938b25a7 to sdk-release

Change-Id: Ib978e6eff1d4cd2d71262a36e3eed913251f5bbc