Merge "Fix mac build." am: 51b4f48280 am: e1a58a8c5c
am: c45d756d70

Change-Id: Id2b214a43c90e0a56161eb195c8efd641e2825f5