am 384c76aa: Merge "Extra debug output in run-test."

* commit '384c76aa054947b611114511fefb1e56a7b3b439':
  Extra debug output in run-test.