diff --git a/android_env/proto/a11y/a11y.proto b/android_env/proto/a11y/a11y.proto
index 289d3ad..90c266b 100644
--- a/android_env/proto/a11y/a11y.proto
+++ b/android_env/proto/a11y/a11y.proto
@@ -19,7 +19,6 @@ package android_env;
 import "android_env/proto/a11y/android_accessibility_forest.proto";
 
 option java_multiple_files = true;
-option use_java_stubby_library = true;
 option java_package = "com.google.androidenv.accessibilityforwarder";
 
 // A service to send Accessibility information to a remote server.
diff --git a/android_env/proto/a11y/android_accessibility_action.proto b/android_env/proto/a11y/android_accessibility_action.proto
index 1658c84..5273d7d 100644
--- a/android_env/proto/a11y/android_accessibility_action.proto
+++ b/android_env/proto/a11y/android_accessibility_action.proto
@@ -18,7 +18,6 @@ package android_env;
 
 option java_multiple_files = true;
 option java_package = "com.google.androidenv.accessibilityforwarder";
-option java_api_version = 2;
 
 // An Android Accessibility Action.
 // Next index: 3
diff --git a/android_env/proto/a11y/android_accessibility_forest.proto b/android_env/proto/a11y/android_accessibility_forest.proto
index 42ef8f9..63ddb8c 100644
--- a/android_env/proto/a11y/android_accessibility_forest.proto
+++ b/android_env/proto/a11y/android_accessibility_forest.proto
@@ -20,7 +20,6 @@ import "android_env/proto/a11y/android_accessibility_window_info.proto";
 
 option java_multiple_files = true;
 option java_package = "com.google.androidenv.accessibilityforwarder";
-option java_api_version = 2;
 
 // A forest of Android accessibility trees. Each tree belongs to a single
 // window. Next index: 2
diff --git a/android_env/proto/a11y/android_accessibility_node_info.proto b/android_env/proto/a11y/android_accessibility_node_info.proto
index efec5e6..3c904c8 100644
--- a/android_env/proto/a11y/android_accessibility_node_info.proto
+++ b/android_env/proto/a11y/android_accessibility_node_info.proto
@@ -22,7 +22,6 @@ import "android_env/proto/a11y/rect.proto";
 
 option java_multiple_files = true;
 option java_package = "com.google.androidenv.accessibilityforwarder";
-option java_api_version = 2;
 
 // An Android AccessibilityNodeInfo.
 // Next index: 32
diff --git a/android_env/proto/a11y/android_accessibility_node_info_clickable_span.proto b/android_env/proto/a11y/android_accessibility_node_info_clickable_span.proto
index c60cade..f20d0bf 100644
--- a/android_env/proto/a11y/android_accessibility_node_info_clickable_span.proto
+++ b/android_env/proto/a11y/android_accessibility_node_info_clickable_span.proto
@@ -18,7 +18,6 @@ package android_env;
 
 option java_multiple_files = true;
 option java_package = "com.google.androidenv.accessibilityforwarder";
-option java_api_version = 2;
 
 // A single clickable span found in the accessibility node's text.
 // Next index: 6
diff --git a/android_env/proto/a11y/android_accessibility_tree.proto b/android_env/proto/a11y/android_accessibility_tree.proto
index 592c467..4bc48ef 100644
--- a/android_env/proto/a11y/android_accessibility_tree.proto
+++ b/android_env/proto/a11y/android_accessibility_tree.proto
@@ -20,7 +20,6 @@ import "android_env/proto/a11y/android_accessibility_node_info.proto";
 
 option java_multiple_files = true;
 option java_package = "com.google.androidenv.accessibilityforwarder";
-option java_api_version = 2;
 
 // A tree (actually a graph) of Android accessibility nodes.
 // Next index: 3
diff --git a/android_env/proto/a11y/android_accessibility_window_info.proto b/android_env/proto/a11y/android_accessibility_window_info.proto
index 915cb10..2e0baee 100644
--- a/android_env/proto/a11y/android_accessibility_window_info.proto
+++ b/android_env/proto/a11y/android_accessibility_window_info.proto
@@ -21,7 +21,6 @@ import "android_env/proto/a11y/rect.proto";
 
 option java_multiple_files = true;
 option java_package = "com.google.androidenv.accessibilityforwarder";
-option java_api_version = 2;
 
 // An Android AccessibilityWindowInfo.
 // Next index: 12
diff --git a/android_env/proto/a11y/rect.proto b/android_env/proto/a11y/rect.proto
index 6240cf1..58167b4 100644
--- a/android_env/proto/a11y/rect.proto
+++ b/android_env/proto/a11y/rect.proto
@@ -18,7 +18,6 @@ package android_env;
 
 option java_multiple_files = true;
 option java_package = "com.google.androidenv.accessibilityforwarder";
-option java_api_version = 2;
 
 // Proto representation of Android Rect.
 // https://developer.android.com/reference/android/graphics/Rect
diff --git a/setup.py b/setup.py
index 29231ed..010018b 100644
--- a/setup.py
+++ b/setup.py
@@ -34,6 +34,14 @@
     'android_env/proto/snapshot_service.proto',
     'android_env/proto/state.proto',
     'android_env/proto/task.proto',
+    'android_env/proto/a11y/a11y.proto',
+    'android_env/proto/a11y/android_accessibility_action.proto',
+    'android_env/proto/a11y/android_accessibility_forest.proto',
+    'android_env/proto/a11y/android_accessibility_node_info.proto',
+    'android_env/proto/a11y/android_accessibility_node_info_clickable_span.proto',
+    'android_env/proto/a11y/android_accessibility_tree.proto',
+    'android_env/proto/a11y/android_accessibility_window_info.proto',
+    'android_env/proto/a11y/rect.proto',
 )
 
 testing_requirements = [