am e7136489: Merge "Improving CTS test stability." into jb-mr2-dev

* commit 'e713648969863d2903c6d622e4513b5c99db6aab':
  Improving CTS test stability.