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

Change-Id: Ic5885f76a96d4dd258d0a93df9af1e5ba71c1847