Merge "Fixing incremental build."