am 0f2edb2a: am d25e59e8: am f15dee03: am e7136489: Merge "Improving CTS test stability." into jb-mr2-dev * commit '0f2edb2a': Improving CTS test stability.