Merge "Snap for 6198741 from 14627b110153b054a7c5b1f4187d3012f7da83b5 to sdk-release" into sdk-release