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

Change-Id: I426356ef94fe8cde53913403d9b5175ecf502885