diff --git a/android/sample/src/main/java/com/facebook/flipper/sample/RootComponentSpec.java b/android/sample/src/main/java/com/facebook/flipper/sample/RootComponentSpec.java
index 7806d943e..17a58e62c 100644
--- a/android/sample/src/main/java/com/facebook/flipper/sample/RootComponentSpec.java
+++ b/android/sample/src/main/java/com/facebook/flipper/sample/RootComponentSpec.java
@@ -135,8 +135,8 @@ public class RootComponentSpec {
 
   @OnEvent(ClickEvent.class)
   static void openDiagnostics(final ComponentContext c) {
-    Intent intent = new Intent(c, FlipperDiagnosticActivity.class);
-    c.startActivity(intent);
+    Intent intent = new Intent(c.getBaseContext(), FlipperDiagnosticActivity.class);
+    c.getBaseContext().startActivity(intent);
   }
 
 }
diff --git a/android/src/main/java/com/facebook/flipper/plugins/litho/DebugComponentDescriptor.java b/android/src/main/java/com/facebook/flipper/plugins/litho/DebugComponentDescriptor.java
index 06f84b6c3..4b3d236fa 100644
--- a/android/src/main/java/com/facebook/flipper/plugins/litho/DebugComponentDescriptor.java
+++ b/android/src/main/java/com/facebook/flipper/plugins/litho/DebugComponentDescriptor.java
@@ -1,5 +1,10 @@
-// Copyright 2004-present Facebook. All Rights Reserved.
-
+/*
+ *  Copyright (c) 2004-present, Facebook, Inc.
+ *
+ *  This source code is licensed under the MIT license found in the LICENSE
+ *  file in the root directory of this source tree.
+ *
+ */
 package com.facebook.flipper.plugins.litho;
 
 import static com.facebook.flipper.plugins.inspector.InspectorValue.Type.Color;
@@ -617,9 +622,9 @@ public class DebugComponentDescriptor extends NodeDescriptor<DebugComponent> {
       return fromDrawable(null);
     }
 
-    final T d = Reference.acquire(c, r);
+    final T d = Reference.acquire(c.getBaseContext(), r);
     final InspectorValue v = fromDrawable(d);
-    Reference.release(c, d, r);
+    Reference.release(c.getBaseContext(), d, r);
     return v;
   }