Merge "Snap for 5234541 from 2f4a5d7c42cf1f3220fc652c83343ad9c256444f to sdk-release" into sdk-release