Merge "short-term fix for flaky CTS tests that need focus" into jb-mr2-dev