Merge "CTS change for bug 7301594 Html.toHtml ... invalid html" into jb-mr1-dev