diff --git a/.gitignore b/.gitignore
index 098862238f..778cc41a2b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ ios_shards.json
 *.log
 test_runner/src/main/resources/binaries/
 ktlint
+flank-scripts.jar
diff --git a/firebase_apis/json/testing_v1.json b/firebase_apis/json/testing_v1.json
index 8169a48e15..fd16ef8ec7 100644
--- a/firebase_apis/json/testing_v1.json
+++ b/firebase_apis/json/testing_v1.json
@@ -1468,8 +1468,12 @@
       "description": "The currently provided software environment on the devices under test.",
       "id": "ProvidedSoftwareCatalog",
       "properties": {
+        "androidxOrchestratorVersion": {
+          "description": "A string representing the current version of AndroidX Test Orchestrator that is used in the environment. The package is available at https://maven.google.com/web/index.html#androidx.test:orchestrator.",
+          "type": "string"
+        },
         "orchestratorVersion": {
-          "description": "A string representing the current version of Android Test Orchestrator that is provided by TestExecutionService. Example: \"1.0.2 beta\".",
+          "description": "A string representing the current version of Android Test Orchestrator that is used in the environment. The package is available at https://maven.google.com/web/index.html#com.android.support.test:orchestrator.",
           "type": "string"
         }
       },
diff --git a/firebase_apis/test_api/src/main/java/com/google/testing/model/ProvidedSoftwareCatalog.java b/firebase_apis/test_api/src/main/java/com/google/testing/model/ProvidedSoftwareCatalog.java
index 1a9b735eda..e6d952eddc 100644
--- a/firebase_apis/test_api/src/main/java/com/google/testing/model/ProvidedSoftwareCatalog.java
+++ b/firebase_apis/test_api/src/main/java/com/google/testing/model/ProvidedSoftwareCatalog.java
@@ -30,16 +30,48 @@
 public final class ProvidedSoftwareCatalog extends com.google.api.client.json.GenericJson {
 
   /**
-   * A string representing the current version of Android Test Orchestrator that is provided by
-   * TestExecutionService. Example: "1.0.2 beta".
+   * A string representing the current version of AndroidX Test Orchestrator that is used in the
+   * environment. The package is available at
+   * https://maven.google.com/web/index.html#androidx.test:orchestrator.
+   * The value may be {@code null}.
+   */
+  @com.google.api.client.util.Key
+  private java.lang.String androidxOrchestratorVersion;
+
+  /**
+   * A string representing the current version of Android Test Orchestrator that is used in the
+   * environment. The package is available at
+   * https://maven.google.com/web/index.html#com.android.support.test:orchestrator.
    * The value may be {@code null}.
    */
   @com.google.api.client.util.Key
   private java.lang.String orchestratorVersion;
 
   /**
-   * A string representing the current version of Android Test Orchestrator that is provided by
-   * TestExecutionService. Example: "1.0.2 beta".
+   * A string representing the current version of AndroidX Test Orchestrator that is used in the
+   * environment. The package is available at
+   * https://maven.google.com/web/index.html#androidx.test:orchestrator.
+   * @return value or {@code null} for none
+   */
+  public java.lang.String getAndroidxOrchestratorVersion() {
+    return androidxOrchestratorVersion;
+  }
+
+  /**
+   * A string representing the current version of AndroidX Test Orchestrator that is used in the
+   * environment. The package is available at
+   * https://maven.google.com/web/index.html#androidx.test:orchestrator.
+   * @param androidxOrchestratorVersion androidxOrchestratorVersion or {@code null} for none
+   */
+  public ProvidedSoftwareCatalog setAndroidxOrchestratorVersion(java.lang.String androidxOrchestratorVersion) {
+    this.androidxOrchestratorVersion = androidxOrchestratorVersion;
+    return this;
+  }
+
+  /**
+   * A string representing the current version of Android Test Orchestrator that is used in the
+   * environment. The package is available at
+   * https://maven.google.com/web/index.html#com.android.support.test:orchestrator.
    * @return value or {@code null} for none
    */
   public java.lang.String getOrchestratorVersion() {
@@ -47,8 +79,9 @@ public java.lang.String getOrchestratorVersion() {
   }
 
   /**
-   * A string representing the current version of Android Test Orchestrator that is provided by
-   * TestExecutionService. Example: "1.0.2 beta".
+   * A string representing the current version of Android Test Orchestrator that is used in the
+   * environment. The package is available at
+   * https://maven.google.com/web/index.html#com.android.support.test:orchestrator.
    * @param orchestratorVersion orchestratorVersion or {@code null} for none
    */
   public ProvidedSoftwareCatalog setOrchestratorVersion(java.lang.String orchestratorVersion) {