Changed more hardcoded HTML to use the Html class

Change-Id: I24d0080d81984a99b07bd95bd22613dc14a537a9
Merge "Changed more hardcoded HTML to use the Html class"