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

Change-Id: Ibdef16931b9d57ce6b6accc7ce4fcb41aefc3238