Merge "Changed HtmlInfo.getAttributes() to return List instead of ArrayList" into oc-dev