Merge change 21581 into eclair

* changes:
  Fix CDMA to startup/shutdown based on apn en/disab