am 1e4711d7: am edd46aea: Merge "CTS change for bug 7301594 Html.toHtml ......
am 1e4711d7: am edd46aea: Merge "CTS change for bug 7301594 Html.toHtml ... invalid html" into jb-mr1-dev
* commit '1e4711d7':
CTS change for bug 7301594 Html.toHtml ... invalid html