Merge "Part of fix for bug 8629392: CTS test failures" into jb-mr2-dev