Merge "Snap for 9550355 from 250b4c2b0a69afc4df9d23f65f42f9e6173febea to sdk-release" into sdk-release