Merge "Use Html parsing on strings where rawXmlValue != value am: a1198b0c89 am: 0ab4d84a78" into rvc-d1-dev-plus-aosp am: 925388fc8f am: 15fa8e3e4e

Change-Id: Ib911e32fafdb6af14ec53adbdc1dd8e8ee3beceb