Merge "Fix mac build."
am: 5da045dc1a

Change-Id: Ie180a5c81a6d8f43bb2e100590e3c1b27ac8b89c