Merge "Snap for 13122790 from 53a103ef33f76970c8cb4cb62aa5825d6731d3c0 to sdk-release" into sdk-release