Merge "Snap for 6198741 from 80c9aa0ff8916d26f163e7bad20b42616e42ffb4 to sdk-release" into sdk-release