am 614e69d4: Merge "Correct return type of delete_all_keys."

* commit '614e69d4a212c1e9bddecb2cb2183d20117a8650':
  Correct return type of delete_all_keys.