Merge "Snap for 7800789 from 4394cdf90094161d5caf4f7237c883ab2862c2f2 to sdk-release" into sdk-release