Merge change 9098

* changes:
  CDMA Message Waiting Indication support