am d26d3fc: am 3fb3946: AI 147687: Several fixes for failing tests in th

Merge commit 'd26d3fc95151c78102bc7bff12bb4b099424fd3f'

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