Merge "Snap for 10214594 from 0cea31e50bcf9efdcf268ddfe51fba7717a44a95 to sdk-release" into sdk-release