Merge "Snap for 13198286 from 6cfc8636effb934ce1bd2b8c7af7e609186448a2 to sdk-release" into sdk-release