Merge "Cleanup Keystore API"