Merge "Snap for 12779445 from 1789df15502f1991eff51ff970dce5df8404dd56 to sdk-release" into sdk-release