Merge "Snap for 6405781 from d3f80c78b02bcf0a4d81017f089c7078bc89d14b to sdk-release" into sdk-release