Merge "Split out AttachmentInfo into its own top-level class" into honeycomb