Merge "Snap for 4953200 from b805514f31a231a0e78a18f296c0454fcadead1a to sdk-release" into sdk-release