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

* commit '89a68fdd1c0da56b5f1770f42a12713bf06fe994':
  Fixing a regression in the CTS tests due to a framework change.