Merge "ConnectivityService needs to use the new names for the NetConfig vars." into honeycomb-LTE