Snap for 11566117 from c185cfb577e95b0cc23d96d8b65958102aa2d5ab to sdk-release

Change-Id: Ib61c6e34fa8f8c7aec21cec8fae1d7383d4a04b0