Add an HTML comment indicating where the message came from

Change-Id: Ib174f0d5e38c4d36e7d2c67445e0ded51720778e
Merge "Add an HTML comment indicating where the message came from"