Snap for 8952093 from a96c6fba37e7d628c439b58cd829e2af73b665a5 to sdk-release

Change-Id: Ib5773e59447496e334543e2ee6707559016ecc58