Merge "Allow BcKeyStoreException to be throw in KeyStoreTest."