Merge "Fix testHtmlEncode"