Merge "Remove old CONNECTION_SERVICE_CONFIGURE setting." into mnc-dev