Merge branch 'main' into avm99963-monorail

Merged commit 3779da353b36d43cf778e7d4f468097714dd4540

GitOrigin-RevId: 6451a5c6b75afb0fd1f37b3f14521148d0722ea8
diff --git a/.vpython3 b/.vpython3
index 909a560..9cc9d49 100644
--- a/.vpython3
+++ b/.vpython3
@@ -11,6 +11,10 @@
   name: "infra/python/wheels/appengine-python-standard-py3"
   version: "version:0.3.1"
 >
+wheel: <
+  name: "infra/python/wheels/ezt-py2_py3"
+  version: "version:1.1"
+>
 
 wheel: <
   name: "infra/python/wheels/flask-py2_py3"
@@ -38,22 +42,47 @@
 >
 
 wheel: <
+  name: "infra/python/wheels/google-cloud-tasks-py2_py3"
+  version: "version:2.8.1"
+>
+
+wheel: <
+  name: "infra/python/wheels/httpagentparser-py2_py3"
+  version: "version:1.9.3"
+>
+
+wheel: <
   name: "infra/python/wheels/httplib2-py3"
   version: "version:0.19.1"
 >
 
 wheel: <
+  name: "infra/python/wheels/mysqlclient/${vpython_platform}"
+  version: "version:2.1.1"
+>
+
+wheel: <
   name: "infra/python/wheels/oauth2client-py2_py3"
   version: "version:4.1.3"
 >
 
 wheel: <
+  name: "infra/python/wheels/protorpc-py2_py3"
+  version: "version:0.12.0"
+>
+
+wheel: <
  name: "infra/python/wheels/six-py2_py3"
  version: "version:1.15.0"
 >
 
 # Required for testing only.
 wheel: <
+  name: "infra/python/wheels/mox3-py2_py3"
+  version: "version:1.1.0"
+>
+
+wheel: <
   name: "infra/python/wheels/pytest-py3"
   version: "version:6.2.2"
 >
@@ -245,6 +274,17 @@
   version: "version:0.4.8"
 >
 
+# Required by mox3==1.1.0
+wheel: <
+  name: "infra/python/wheels/pbr-py2_py3"
+  version: "version:5.9.0"
+>
+
+wheel: <
+  name: "infra/python/wheels/fixtures-py2_py3"
+  version: "version:4.0.1"
+>
+
 # Required by pytest==6.2.2
 wheel: <
   name: "infra/python/wheels/iniconfig-py3"