Merge "Snap for 5590969 from 6408e6aaa86998a7a44b9983cb137011c08a2d3d to sdk-release" into sdk-release