Merge "Fix dependency on changed Java projects."