Merge "Remove STOPSHIP from AttachmentDownloadService" into honeycomb