Snap for 11871564 from 16fc4fefeeb8d305501d4d625cc82e03aaac8b07 to sdk-release

Change-Id: If896c530e59a78793f8825e4d058643199e3933b