Merge "Snap for 13198286 from 60ff0ca61c33347e58543c37beafc9817108ae45 to sdk-release" into sdk-release