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

Change-Id: I36f1108e43c8d07181305bdd6464ecfcc5533b0e