Merge "Snap for 5234541 from 7cb89fec518146a3e054a9aba0f1422e6749d7bd to sdk-release" into sdk-release