diff --git a/contract-tests/src/main/java/com/launchdarkly/sdktest/TestService.java b/contract-tests/src/main/java/com/launchdarkly/sdktest/TestService.java
index ab27b379..c356d55c 100644
--- a/contract-tests/src/main/java/com/launchdarkly/sdktest/TestService.java
+++ b/contract-tests/src/main/java/com/launchdarkly/sdktest/TestService.java
@@ -34,7 +34,7 @@ public class TestService extends NanoHTTPD {
             "strongly-typed",
             "tags",
             "auto-env-attributes",
-            "inline-context",
+            "inline-context-all",
             "anonymous-redaction",
             "client-prereq-events"
     };
diff --git a/launchdarkly-android-client-sdk/build.gradle b/launchdarkly-android-client-sdk/build.gradle
index 22ce5c97..c135b313 100644
--- a/launchdarkly-android-client-sdk/build.gradle
+++ b/launchdarkly-android-client-sdk/build.gradle
@@ -66,7 +66,7 @@ ext.versions = [
     "jacksonDatabind": "2.10.5.1",
     "junit": "4.13",
     "launchdarklyJavaSdkCommon": "2.1.1",
-    "launchdarklyJavaSdkInternal": "1.3.0",
+    "launchdarklyJavaSdkInternal": "1.4.0",
     "launchdarklyLogging": "1.1.1",
     "okhttp": "4.9.2",
     "timber": "5.0.1",
diff --git a/launchdarkly-android-client-sdk/src/androidTest/java/com/launchdarkly/sdk/android/LDClientEventTest.java b/launchdarkly-android-client-sdk/src/androidTest/java/com/launchdarkly/sdk/android/LDClientEventTest.java
index 97aaf420..b8331b78 100644
--- a/launchdarkly-android-client-sdk/src/androidTest/java/com/launchdarkly/sdk/android/LDClientEventTest.java
+++ b/launchdarkly-android-client-sdk/src/androidTest/java/com/launchdarkly/sdk/android/LDClientEventTest.java
@@ -2,6 +2,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -366,13 +367,10 @@ private void assertIdentifyEvent(LDValue event, LDContext context) {
         assertEquals("identify", event.get("kind").stringValue());
     }
 
-    private void assertContextKeys(LDValue event, LDContext context) {
-        ObjectBuilder o = LDValue.buildObject();
-        for (int i = 0; i < context.getIndividualContextCount(); i++) {
-            o.put(context.getIndividualContext(i).getKind().toString(),
-                    context.getIndividualContext(i).getKey());
-        }
-        assertEquals(o.build(), event.get("contextKeys"));
+    private void assertContext(LDValue event, LDContext context) {
+        assertNotNull(event.get("context"));
+        assertEquals(context.getKind().toString(), event.get("context").get("kind").stringValue());
+        assertEquals(context.getKey(), event.get("context").get("key").stringValue());
     }
 
     private void assertFeatureEvent(LDValue event, LDContext context) {
@@ -381,7 +379,7 @@ private void assertFeatureEvent(LDValue event, LDContext context) {
 
     private void assertCustomEvent(LDValue event, LDContext context, String eventKey) {
         assertEquals("custom", event.get("kind").stringValue());
-        assertContextKeys(event, context);
+        assertContext(event, context);
         assertEquals(eventKey, event.get("key").stringValue());
     }