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

* commit 'b9554eedc782391eb5304c03a0bf8f01b0280499':
  Correct return type of delete_all_keys.