Merge "Snap for 13198286 from 894f009785d395a9dfa08fa521f941552c509017 to sdk-release" into sdk-release