Merge "Snap for 7904124 from 1a3824e4d712fe9bedbaa9c496f02bd31cb7321a to sdk-release" into sdk-release