Merge "Snap for 13198286 from 7977ed5eb44b3204e279ce97205582b3e7ac8064 to sdk-release" into sdk-release