diff --git a/common b/common
index f5ffedadb0..1096d86451 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit f5ffedadb09555a180870de458021fa78e41fe1b
+Subproject commit 1096d86451a6b95310930bc18c8aea888cca7549
diff --git a/msal/src/test/java/com/microsoft/identity/client/e2e/shadows/ShadowAndroidSdkStorageEncryptionManager.java b/msal/src/test/java/com/microsoft/identity/client/e2e/shadows/ShadowAndroidSdkStorageEncryptionManager.java
index 8e16b2cb97..ec111299b8 100644
--- a/msal/src/test/java/com/microsoft/identity/client/e2e/shadows/ShadowAndroidSdkStorageEncryptionManager.java
+++ b/msal/src/test/java/com/microsoft/identity/client/e2e/shadows/ShadowAndroidSdkStorageEncryptionManager.java
@@ -23,27 +23,25 @@
 package com.microsoft.identity.client.e2e.shadows;
 
 import com.microsoft.identity.common.crypto.AndroidAuthSdkStorageEncryptionManager;
-import com.microsoft.identity.common.java.crypto.key.PredefinedKeyLoader;
-import com.microsoft.identity.common.java.crypto.key.AES256KeyLoader;
+import com.microsoft.identity.common.java.crypto.key.PredefinedKeyProvider;
+import com.microsoft.identity.common.java.crypto.key.ISecretKeyProvider;
 
 import org.robolectric.annotation.Implements;
 
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 @Implements(AndroidAuthSdkStorageEncryptionManager.class)
 public class ShadowAndroidSdkStorageEncryptionManager {
 
     final byte[] encryptionKey = new byte[]{22, 78, -69, -66, 84, -65, 119, -9, -34, -80, 60, 67, -12, -117, 86, -47, -84, -24, -18, 121, 70, 32, -110, 51, -93, -10, -93, -110, 124, -68, -42, -119};
-    final AES256KeyLoader mUserDefinedKey = new PredefinedKeyLoader("MOCK_ALIAS", encryptionKey);
+    final ISecretKeyProvider mUserDefinedKey = new PredefinedKeyProvider("MOCK_ALIAS", encryptionKey);
 
-    public  AES256KeyLoader getKeyLoaderForEncryption() {
+    public ISecretKeyProvider getKeyProviderForEncryption() {
         return mUserDefinedKey;
     }
 
-    public List<AES256KeyLoader> getKeyLoaderForDecryption(byte[] cipherText) {
-        return new ArrayList<AES256KeyLoader>() {{
-            add(mUserDefinedKey);
-        }};
+    public List<ISecretKeyProvider> getKeyProviderForDecryption(byte[] cipherText) {
+        return Collections.singletonList(mUserDefinedKey);
     }
 }