am c5ceeeed: Merge change 20354 into donut

Merge commit 'c5ceeeedeeb1cc3ba3d8b54b04f983ae666755a2'

* commit 'c5ceeeedeeb1cc3ba3d8b54b04f983ae666755a2':
  strip comments from event-log-tags on device