Merge "Snap for 5798008 from 7b87949ae148510e3c30a9879e6cb884228f8179 to sdk-release" into sdk-release