Merge change 6890

* changes:
  CDMA: Add Network ID and System ID to CdmaCellLocation.