Merge "Fix mac build" am: 058a64acf5
am: c53581aea3

Change-Id: Ic1df5a1e79e80a1db12a1775bf0977a0b03d4a49