Merge "Snap for 6198741 from 3e4e6f7d41f7ca387810fc88370d9bcd8c937fb9 to sdk-release" into sdk-release