Merge "Snap for 12779445 from 4bfccde5c7e9ea06f821db40ef0af54f6695c320 to sdk-release" into sdk-release