Workaround for Change Ifbeae7e9

Making sure we don't have escaped HTML output on the page.

Change-Id: Ib4ebef7da9d417ddbd555c3ea1d64449ab16ec93
Merge "Workaround for Change Ifbeae7e9"