Merge "Snap for 5277895 from 540ee36ac88d8aa45efac4b3e4a4fe78e0101d62 to sdk-release" into sdk-release