Merge "Cleanup some of the run-test system" am: 065f519190
am: 2c10e02065

* commit '2c10e0206511267937c0834181008385f2d71693':
  Cleanup some of the run-test system