Merge "Fix IllegalArgumentException in KeyChain"