am b867019: AI 147725: Some fixes for the CTS test runner. One is a

Merge commit 'b867019173d20cd4fd7ee79a3ce924096e95a241' into donut

* commit 'b867019173d20cd4fd7ee79a3ce924096e95a241':
  AI 147725: Some fixes for the CTS test runner. One is a