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

Change-Id: I89279049e7783bb8381bf59fb348ea0a887dc6a1