Merge "Fix broken CTS test" into klp-modular-dev