Snap for 8554636 from 9f0739e4d9e9bc5a0effb00fc36716ba9543d221 to sdk-release

Change-Id: I6dee4a9b93b2caa7c3c3b535115f6c025199f59d