Merge "Snap for 5735642 from 2b930af9d71e482e0295e10beffd9c5bac9e35c0 to sdk-release" into sdk-release