Merge "Snap for 11605179 from f83f0debad5d427c469854ea305aa45503013ab8 to sdk-release" into sdk-release