Merge "Fix incremental builds" into jb-dev