Fix mac build
am: e9ea1927a4

Change-Id: Ib10bd347cc8f1e1f3e80a25d9c7faa02d86a1567