Merge "Fix lint warnings." into nyc-dev