Fix mac build am: e9ea1927a4 am: 039df7249d am: 5f2b20df25
am: c75b9e9a85

Change-Id: Iad6b713693338619d1a86be8fc5932d15f4e2a4d