Merge "Snap for 13198286 from 1548076841f243748a3f56da23b38794d437bc12 to sdk-release" into sdk-release