Fix lint errors.
Merge remote-tracking branch 'origin' into nat