Merge "Snap for 5234541 from d3954f12bb2aa2bfbad3b3d22285867f0e12bb7e to sdk-release" into sdk-release