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