Snap for 8952093 from a02e02ac68dea2ff0aa229026390de6e873c850a to sdk-release

Change-Id: I80c0dbb92edc8923421d27442a4196ad7a3a3263