Merge "Fix mac build"
am: 3fec871cae

Change-Id: I9ef9ec5a9e538e8b411a51edbae658659ecc3dbc