am 05eb2b37: am bd6b5dd3: Merge "Revert "Fix mac build""

* commit '05eb2b372a910bf684b71c5e8da254e22706d420':
  Revert "Fix mac build"