Merge "Remove deprecated back-compat HtmlFormatter class"