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

* commit '98b9f7eecfdf7eefec99753dda718244474dc133':
  Cleanup some of the run-test system