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

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