Merge "Fixing a regression in the CTS tests due to a framework change." into jb-dev