Merge "KeyStore: Verbose error reporting"