Snap for 5949240 from a1ebc66b6fe12be1f38ade6cc98f38edc980eb85 to sdk-release

Change-Id: I5bdcbab6543c24512e77f10668995839a86bd06f