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

Change-Id: Iaac7467a90e80c83d225fa019653b5db79fb9ffc