Merge "Snap for 6290619 from 81665216b1b4332dff01cd0639aaa7a827942e0b to sdk-release" into sdk-release