Merge "Fix CTS remquo test detail" into lmp-dev