Merge "Snap for 10929834 from 6d7f987710eebdcc6b7b0180f50eb65086f06dd7 to sdk-release" into sdk-release