Merge "Fix the MacOS build of incremental*" am: c253a8be71 am: 53d9439d9f

Change-Id: Ie67e0b2c1a71c68359f620be57aa8ec7a8d422ca