Merge "Keystore 2.0: Don't panic key negotiation checksum failure."