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

Change-Id: I5398a804be6f6674a0371fe319ba8789bd72e7f0