Merge "Keystore: Remove duplicate method."