Fix macOS build am: c3ccab73be am: 8fb5ed9dfb
am: ac0e9d5a7b

Change-Id: Ic39f4ea489c183c089a74fe41bfbd22efac32f7a