Merge change 6734 into donut

* changes:
  Adding tagging to utterances to track which app said what.