Address review comments for r202185, no functionality changes.