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

* commit 'bd6b5dd3ce0f4d5454334d4848a97b00120b235e':
  Revert "Fix mac build"