Merge "Snap for 7183507 from 46790d2eae893d1489b14aff4525d9cb1b87c37a to sdk-release" into sdk-release