Merge "Snap for 5234541 from 72e62a14985da480f5f6f28f3d22a123b61de3b3 to sdk-release" into sdk-release