Merge "Snap for 6198741 from 7ea2e46dc1bce32d4d207408f2b4a14d5933bef5 to sdk-release" into sdk-release