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

Change-Id: I704d22ca89f9c2c7a4eafd79d8546c53b55e39d4