Merge "Fix up run-test."
am: 9b4571cadc

* commit '9b4571cadcc36f2cae09a60f3f45db30ab7b1478':
  Fix up run-test.