Merge "Fix incremental builds"