Merge "Credstore: Remove dependency to keystore1."