Merge "Fixes lint warnings" into nyc-dev