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