Snap for 6533464 from 37e8b5e58770102168086e05546003f16c6b5613 to sdk-release

Change-Id: Id17e1641deec41bf256bf0de6d50f00c0b378fff