am 2a384265: Merge "Fix Mac build"

* commit '2a38426583d320ddd234f74594db1fb16ae75d16':
  Fix Mac build