Merge "tombstoned: log where we're writing the tombstone." am: 87f5432f52 am: 5e84d90791 am: 4e64f812d7
am: 848a2ba282

Change-Id: I3663c2495181ff1c04b8b86d0ba78862cae23d73