Merge "KeyStore: Remove duplicate method"