Merge "Snap for 13198286 from 4d11a50c5bc4f024072d89e68f63068803b10989 to sdk-release" into sdk-release