Merge change 2399 into donut

* changes:
  Motorola additions for CDMA support without CdmaSuppConnTracker