Merge "Remove config variable to disable connection service APIs" into lmp-dev