Merge "Snap for 9979206 from 136a00cc964831c54e3d40dce88cbbac333faa9e to sdk-release" into sdk-release