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

Change-Id: Ie1bb36467ab7efea42beb2bc314d5a4ea7f0b90e