am e03864e9: Merge "Try to fix mac build."

* commit 'e03864e99f5ab0e27a48a17275122ad8f324b615':
  Try to fix mac build.