Merge "Snap for 7757670 from e0e160c54bfe3fb040108d7d3de50549a649deb8 to sdk-release" into sdk-release