Merge change 1950 into donut

* changes:
  new cdma event log tags