Merge "Snap for 6198741 from 0e521ae9aa2c8b1b3d30870ec9662affef4b61a7 to sdk-release" into sdk-release