Snap for 11130662 from 5f3de4f5b9d52fe7b3f68558c864478afa932e43 to sdk-release

Change-Id: Ic3d34828075924821410c8ae839f005f0baf5b52