Merge "Fix a CTS test" into lmp-preview-dev