Merge "Snap for 8554636 from 91e4b8ff33c372c8d300a928e417a90dc83de4bd to sdk-release" into sdk-release