Merge change 1522 into donut

* changes:
  support more minor cdms sms bearer data subparameters