Workaround for Change Ifbeae7e9

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

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