Use Html parsing on strings where rawXmlValue != value am: a1198b0c89 am: 534f85f57f am: 5822697d56

Change-Id: I8ec333f6c6da2b48d67968d715027b3142b0488d