am 67555f1f: Merge "Fixing mac build"

* commit '67555f1f1c890b12f5936bfa5a25efa70865970a':
  Fixing mac build