Merge "Snap for 7183507 from 02fe3b1af92ae5f46c3a53c32772d28299cffb96 to sdk-release" into sdk-release