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

Change-Id: If158ebdc3064be744bbb2680fba2ac80390ce987