Merge "ConnectionService API has only one completed callback (1/3)" into lmp-dev