Merge "Add Intent to configure ConnectionService" into lmp-dev