Merge change 7359 into donut

* changes:
  Minor tweak to CDMA_SUBSCRIPTION.