Merge "Snap for 7736735 from 7ea42b96e6ca4a2627ba4b750dea7498e4d0eed1 to sdk-release" into sdk-release