Merge "Snap for 6198741 from cd8b982e40d1cf13360e552b81fab520810c7adc to sdk-release" into sdk-release