Merge "Fix the MacOS build of incremental*" am: f10099d79a am: 1714e21a8f

Change-Id: Ie67e0b2c1a71c68359f620be57aa8ec7a8d422ca