Snap for 11754915 from b6ca62b2bc6b28d99e9ebd8c29591c30a6a78d1f to sdk-release

Change-Id: I9776dff64348c701560a5ad6b6fe4d3f327762a8