Merge "KeyStore.reset changes"