Merge "tombstoned: log where we're writing the tombstone." into oc-dev
am: 855333f346  -s ours

Change-Id: I23e17c351bb2243850074be335677431119c0b70