Merge "Snap for 6660490 from 78f39a0b3dbccad698027acdc61b1d4b472bee3b to sdk-release" into sdk-release