Snap for 10399941 from 771bb58d604a7424fe6e1877084b841e31551e7d to sdk-release

Change-Id: Ia32dcb96008b6bcdcc3334970ca743df1ef3432b