am cc90809c: Merge "Fix runtest for CTS Tests"

* commit 'cc90809c261dea1764bd6f8cd4455add6f6b1797':
  Fix runtest for CTS Tests