am 606858f6: Merge "Fix CTS test to not rely on assumptions / side-effects" into klp-dev

* commit '606858f670a3f95e4212dbe46c4953f11fe69221':
  Fix CTS test to not rely on assumptions / side-effects