Merge "Snap for 9550355 from fd6bc55527d6e441e9361b5a55678f836a068480 to sdk-release" into sdk-release