Merge "Snap for 9679998 from f248774ff16e896324994489dd0b35dc3900a121 to sdk-release" into sdk-release