Merge change 2347 into donut

* changes:
  Fix Disconnect path for CDMA.