Merge "Fix incremental build" into nyc-dev