Snap for 10929834 from 32ad22f6c84ebf1dd73ce5dfc0bbc0533df4ebc8 to sdk-release Change-Id: I711b7b13cfdf790e223ee4e12f1cbe37b13d1a36