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

Change-Id: Ia0ce94839e9d47804d8bb7a75c4b30afff9c30a4