Merge "Snap for 6533464 from aaec3d66fef06d9f460df04bed4256ffa16bfe28 to sdk-release" into sdk-release