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

Change-Id: Ib3bcff33d63bcb78198ed3d710db8b5be71858d5