Merge \"Fix mac build.\"
am: c23d6450c9

Change-Id: I38d3f92361b0176074d08c88e1f1dfae1f6a361a