Merge change 20354 into donut

* changes:
  strip comments from event-log-tags on device