Merge "Snap for 13198286 from 4172785427289db0804f06dd13176b52bd35451a to sdk-release" into sdk-release