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