Merge "Snap for 7487883 from 31a1157509720bee37595e312bb5c90dcf2d3d7c to sdk-release" into sdk-release