Merge "Check return from DeleteKey correctly." into oc-dev am: c4f859d1b5
am: da4568eb18

Change-Id: I59531a8ca8a0550a9e36ef1b8bb848f616fc153e