Snap for 11598262 from a74e8aac9e7a3aed7edd379cc6562f4d02fdaf71 to sdk-release

Change-Id: I602cdac2f5753f274b7755ede719b0d342602728