Merge "Keystore: Added missing error codes"