Merge "Snap for 6660490 from 0f71dcac864d807b89630a30726cf0396b2859ba to sdk-release" into sdk-release