Merge "Snap for 5234541 from da1f8b241419474abd524910f457accf03218638 to sdk-release" into sdk-release