am 1190e0e4: Merge "Fix mac build"

* commit '1190e0e48ae9f60383c02e1c30f3b9a7b01d5de4':
  Fix mac build