Merge "Snap for 8952093 from 2abfe5f3a356d7e53b561f783c6d9c7d3d468733 to sdk-release" into sdk-release