Snap for 10929834 from 99efea85871d23f5aeccb324ebaf47b86cd15770 to sdk-release

Change-Id: Ibc461f8706169e23e79478d840171adfbc704e3f