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

Change-Id: I9e8a9b81c890eb08bb089faaa1c3b3bd9fc9893f