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

Change-Id: Ia47055bf963e67c7bc5849ebc08d2ec8ba7fe03f