am 4b855675: Merge "Fix run-test for OSX."

* commit '4b855675b7c77e265aa69a9134dd50cc21273095':
  Fix run-test for OSX.