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

Change-Id: If5efc52034bb97276105298b8b9caf4ad0d2e48f