Merge "Fix CTS test for updated API" into jb-dev