Merge "Remove unused include" into nyc-dev