am e6be8706: Merge change 1950 into donut

Merge commit 'e6be870641d6db12493342c53344d68f464cc0a8'

* commit 'e6be870641d6db12493342c53344d68f464cc0a8':
  new cdma event log tags