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

* commit '4a7a553a482d6fb5ca8930dc005fbfe8c3ff8e76':
  Fix up run-test.