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

* commit '065f51919001bbad2ce8ddbc1b6273f480b3f898':
  Cleanup some of the run-test system