Fix mac build am: e9ea1927a4
am: 039df7249d

Change-Id: I60ca3e0d58688f8fd6033e37d4177e9cb5d32ad6