am 19aa8e0: am b867019: AI 147725: Some fixes for the CTS test runner. O

Merge commit '19aa8e01b8fe4ebd6d518bd48ea9b53ec95a49a7'

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