Merge "Skip TimaKeyStore in KeyStoreTest"