am 60430803: Merge "Fix Mac build."

* commit '60430803a7964b68269e42f04acadb070b25c58c':
  Fix Mac build.