Fixing some broken and flaky CTS tests.

Change-Id: Ia4b81924175f3e3c35152eb9ee6146d5dd7394d7
3 files changed