Also iterated on some logging to help debug Attachment issues: Bug: 17789960 Change-Id: I77331f9a41f5c95ed228e8ca5fd36a66db5b78ee
This reduces the tombstone down by 100K A follow-on cl will remove the unused resources from the tombstone build Bug: 17414014 Change-Id: I5d38811b17a5273ec726e750ab123e10e36cee04