Merge "Snap for 11812660 from 0e67aa0caee9500b61b9c1c8b6e5cab18301364c to sdk-release" into sdk-release