Snap for 10929834 from 6a05a6fd9c9e46dd403e791d1405a2607b2c71fe to sdk-release

Change-Id: I030c2ddcfcce54239e1565fdf4f4cf8c92e8e2e4