am 8fc94823: am 42a6c754: am 3a38c110: Merge "Fix mac build"

* commit '8fc94823cfd7f9f2403f1ad553d84544252c7849':
  Fix mac build