Fix mac build. am: 631c662e75 am: f7d27392bd
am: 27b54250e1

Change-Id: I217dae78457f34b3e3a3d307db4b08aa5ae2c31c