Merge "Snap for 5735642 from 10b5ef5d180bc5b0a2116f112b87153b16c3de00 to sdk-release" into sdk-release