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

Change-Id: I6b28215be9b3b7586d7fe93f942e43af1067ec9e