Snap for 10929834 from 7e3a46605a42e7b5b7d255daea91c8afc25db600 to sdk-release

Change-Id: Iebe303cdf7ea4c92d55a3af5909d753d513424a1