Merge "Snap for 12779445 from d353a188ca6ec4b5eba25b5fbd7bcb8ce61322fb to sdk-release" into sdk-release