Better debug logging on delete/update failures

Change-Id: I5f43ddcaf6929f38660387659e9b914a4a86f3c1
Merge "Better debug logging on delete/update failures"