Merge "Improve CTS generated tests (cts)." into lmp-dev