Merge "Fix incorrect connection ID for remote connection service" into lmp-dev