Merge "Fix testHtmlEncode" into ics-mr1