am aa880c91: am b070e486: Merge "Reliably delete keys if key generation fails." into mnc-dev

* commit 'aa880c9122912cc34a2969af9afc48816f87084e':
  Reliably delete keys if key generation fails.