Snap for 6533464 from 3e861c24de3802b703ac71624cf7d0553d7105a5 to sdk-release

Change-Id: Ic29f397181e99c73b9fc3e0bca1c18e280912679