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

Change-Id: I24527510bcd72671d0e908c84fed02748028383d