Merge "More Mac build fixes." am: 55d31ecd86
am: 9cf0730fcf

Change-Id: Ia751ae61a2eb3939afab24bad4ce29d6f66d3472