Merge "Snap for 7981427 from fe99de597e8f68abb64a9d7e9ab982de4b3d17f1 to sdk-release" into sdk-release