Merge "Snap for 6660490 from 74d07fafdc71a85d30f57c24bec44a51b8d6b1ad to sdk-release" into sdk-release