am 3fb3946: AI 147687: Several fixes for failing tests in the cts host. 

Merge commit '3fb3946640bdc1294131417ac6593a789373090d' into donut

* commit '3fb3946640bdc1294131417ac6593a789373090d':
  AI 147687: Several fixes for failing tests in the cts host. also tests that timeout