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

Change-Id: I51b418043296f6390cddbef48ee3ba51fb4f7cfc