Merge "Snap for 6198741 from 9d48201be3f7857d981b00986d597424a7f67041 to sdk-release" into sdk-release