Merge "DataConnection: set CID to the correct value." into honeycomb-LTE