Merge "Snap for 5590969 from 114a0257803d51ddcdad83f24be3d10c1928fef1 to sdk-release" into sdk-release