Merge "Adding settings for connection services." into mnc-dev