am b175740f: am 25e966ed: Merge "Log when there are an unexpected number of attachments" into jb-ub-mail-ur9

* commit 'b175740f3707c201d5dd4de9416d741ada2eacd6':
  Log when there are an unexpected number of attachments