Merge "Snap for 9550355 from 0468142306ee9b92e0385179637862f7fed236ce to sdk-release" into sdk-release