Merge "Snap for 13198286 from 93aabd34861ce45975c1bd275e3350ea719d9926 to sdk-release" into sdk-release