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

Change-Id: Ib3bcff33d63bcb78198ed3d710db8b5be71858d5