Snap for 10929834 from 088332b5b69e7ab13924864b272aabfc2509d2d5 to sdk-release

Change-Id: Ib4d3f9706d436cdfb55b2f8231177e2c7ce7d4e2