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

* commit '2a7628a0698a27646b15beec798701f2515897ae':
  Fix run-test for OSX.