Misc attachment code cleanups

Change-Id: I612b3ed1280d4d057834d3d3e67c8ac17c2bafb6
5 files changed