Merge "Fix CTS test failures." into jb-mr1-dev