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

Change-Id: I1b75e0e1eb21ca42b70be55535693ac4c27118b1