Merge "Remove onConnectionAdded/Removed from ConnectionService API (2/2)" into lmp-dev