diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidAssetsInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidAssetsInfoApi.java
index 42b5b62291fe80..439dd9982e3e6b 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidAssetsInfoApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidAssetsInfoApi.java
@@ -26,7 +26,6 @@
 import com.google.devtools.build.lib.skylarkinterface.SkylarkModuleCategory;
 import com.google.devtools.build.lib.syntax.EvalException;
 import com.google.devtools.build.lib.syntax.SkylarkNestedSet;
-import com.google.devtools.build.lib.syntax.StarlarkSemantics.FlagIdentifier;
 import javax.annotation.Nullable;
 
 /** Provides information about transitive Android assets. */
@@ -44,12 +43,7 @@ public interface AndroidAssetsInfoApi<FileT extends FileApi, AssetsT extends Par
   /** The name of the provider for this info object. */
   String NAME = "AndroidAssetsInfo";
 
-  @SkylarkCallable(
-      name = "label",
-      structField = true,
-      doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+  @SkylarkCallable(name = "label", structField = true, doc = "", documented = false)
   Label getLabel();
 
   @SkylarkCallable(
@@ -63,17 +57,11 @@ public interface AndroidAssetsInfoApi<FileT extends FileApi, AssetsT extends Par
               + " in native code, this artifact is added to the top-level output group (so"
               + " validation is only done if the target is requested on the command line). The"
               + " contents of this artifact are subject to change and should not be relied upon.",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      documented = false)
   @Nullable
   FileApi getValidationResult();
 
-  @SkylarkCallable(
-      name = "direct_parsed_assets",
-      structField = true,
-      doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+  @SkylarkCallable(name = "direct_parsed_assets", structField = true, doc = "", documented = false)
   NestedSet<AssetsT> getDirectParsedAssets();
 
   /** Returns the local assets for the target. */
@@ -82,8 +70,7 @@ public interface AndroidAssetsInfoApi<FileT extends FileApi, AssetsT extends Par
       doc = "Returns the local assets for the target.",
       documented = false,
       allowReturnNones = true,
-      structField = true,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      structField = true)
   ImmutableList<FileT> getLocalAssets();
 
   /** Returns the local asset dir for the target. */
@@ -92,40 +79,23 @@ public interface AndroidAssetsInfoApi<FileT extends FileApi, AssetsT extends Par
       doc = "Returns the local asset directory for the target.",
       documented = false,
       allowReturnNones = true,
-      structField = true,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      structField = true)
   String getLocalAssetDir();
 
   @SkylarkCallable(
       name = "transitive_parsed_assets",
       structField = true,
       doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      documented = false)
   NestedSet<AssetsT> getTransitiveParsedAssets();
 
-  @SkylarkCallable(
-      name = "assets",
-      structField = true,
-      doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+  @SkylarkCallable(name = "assets", structField = true, doc = "", documented = false)
   NestedSet<FileT> getAssets();
 
-  @SkylarkCallable(
-      name = "symbols",
-      structField = true,
-      doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+  @SkylarkCallable(name = "symbols", structField = true, doc = "", documented = false)
   NestedSet<FileT> getSymbols();
 
-  @SkylarkCallable(
-      name = "compiled_symbols",
-      structField = true,
-      doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+  @SkylarkCallable(name = "compiled_symbols", structField = true, doc = "", documented = false)
   NestedSet<FileT> getCompiledSymbols();
 
   /** The provider implementing this can construct the AndroidAssetsInfo provider. */
@@ -142,7 +112,6 @@ public interface Provider<FileT extends FileApi, AssetsT extends ParsedAndroidAs
         name = NAME,
         doc = "The <code>AndroidAssetsInfo</code> constructor.",
         documented = false,
-        enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS,
         parameters = {
           @Param(
               name = "label",
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidBinaryDataInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidBinaryDataInfoApi.java
index c37512f951d7c3..98230f4c47aa57 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidBinaryDataInfoApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidBinaryDataInfoApi.java
@@ -18,7 +18,6 @@
 import com.google.devtools.build.lib.skylarkinterface.SkylarkCallable;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkModule;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkModuleCategory;
-import com.google.devtools.build.lib.syntax.StarlarkSemantics.FlagIdentifier;
 
 /**
  * Provides information on Android resource, asset, and manifest information specific to binaries.
@@ -41,15 +40,13 @@ public interface AndroidBinaryDataInfoApi<FileT extends FileApi> extends StructA
       name = "resource_apk",
       structField = true,
       doc = "The resource apk.",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      documented = false)
   FileT getApk();
 
   @SkylarkCallable(
       name = "resource_proguard_config",
       structField = true,
       doc = "Proguard config generated for the resources.",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      documented = false)
   FileT getResourceProguardConfig();
 }
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidCcLinkParamsProviderApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidCcLinkParamsProviderApi.java
index 6bf17cfff4f9ba..cfc9524cf3a1e9 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidCcLinkParamsProviderApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidCcLinkParamsProviderApi.java
@@ -23,7 +23,6 @@
 import com.google.devtools.build.lib.skylarkinterface.SkylarkModule;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkModuleCategory;
 import com.google.devtools.build.lib.syntax.EvalException;
-import com.google.devtools.build.lib.syntax.StarlarkSemantics.FlagIdentifier;
 
 /** A target that provides C++ libraries to be linked into Android targets. */
 @SkylarkModule(
@@ -39,12 +38,7 @@ public interface AndroidCcLinkParamsProviderApi<T extends CcInfoApi> extends Str
   String NAME = "AndroidCcLinkParamsInfo";
 
   /** Returns the cc link params. */
-  @SkylarkCallable(
-      name = "link_params",
-      structField = true,
-      doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+  @SkylarkCallable(name = "link_params", structField = true, doc = "", documented = false)
   T getLinkParams();
 
   /** The provider implementing this can construct the AndroidCcLinkParamsInfo provider. */
@@ -60,7 +54,6 @@ public interface Provider<T extends CcInfoApi> extends ProviderApi {
         name = NAME,
         doc = "The <code>AndroidCcLinkParamsInfo</code> constructor.",
         documented = false,
-        enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS,
         parameters = {
           @Param(
               name = "store",
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidConfigurationApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidConfigurationApi.java
index 42be042f793e8b..30f8109dd29683 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidConfigurationApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidConfigurationApi.java
@@ -17,7 +17,6 @@
 import com.google.devtools.build.lib.skylarkinterface.SkylarkCallable;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkModule;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkModuleCategory;
-import com.google.devtools.build.lib.syntax.StarlarkSemantics.FlagIdentifier;
 
 /** Configuration fragment for Android rules. */
 @SkylarkModule(
@@ -34,185 +33,137 @@ public interface AndroidConfigurationApi {
       name = "android_cpu",
       structField = true,
       doc = "The Android target CPU.",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      documented = false)
   String getCpu();
 
   @SkylarkCallable(
       name = "use_incremental_dexing",
       structField = true,
       doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      documented = false)
   boolean useIncrementalDexing();
 
   @SkylarkCallable(
       name = "incremental_dexing_shards_after_proguard",
       structField = true,
       doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      documented = false)
   int incrementalDexingShardsAfterProguard();
 
   @SkylarkCallable(
       name = "incremental_dexing_use_dex_sharder",
       structField = true,
       doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      documented = false)
   boolean incrementalDexingUseDexSharder();
 
   @SkylarkCallable(
       name = "incremental_dexing_after_proguard_by_default",
       structField = true,
       doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      documented = false)
   boolean incrementalDexingAfterProguardByDefault();
 
-  @SkylarkCallable(
-      name = "apk_signing_method_v1",
-      structField = true,
-      doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+  @SkylarkCallable(name = "apk_signing_method_v1", structField = true, doc = "", documented = false)
   boolean apkSigningMethodV1();
 
-  @SkylarkCallable(
-      name = "apk_signing_method_v2",
-      structField = true,
-      doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
-  boolean apkSigningMethodV2();
-  ;
+  @SkylarkCallable(name = "apk_signing_method_v2", structField = true, doc = "", documented = false)
+  boolean apkSigningMethodV2();;
 
   @SkylarkCallable(
       name = "assume_min_sdk_version",
       structField = true,
       doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      documented = false)
   boolean assumeMinSdkVersion();
 
   @SkylarkCallable(
       name = "get_dexopts_supported_in_incremental_dexing",
       structField = true,
       doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      documented = false)
   ImmutableList<String> getDexoptsSupportedInIncrementalDexing();
 
   @SkylarkCallable(
       name = "get_dexopts_supported_in_dex_merger",
       structField = true,
       doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      documented = false)
   ImmutableList<String> getDexoptsSupportedInDexMerger();
 
   @SkylarkCallable(
       name = "get_target_dexopts_that_prevent_incremental_dexing",
       structField = true,
       doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      documented = false)
   ImmutableList<String> getTargetDexoptsThatPreventIncrementalDexing();
 
   @SkylarkCallable(
       name = "use_workers_with_dexbuilder",
       structField = true,
       doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      documented = false)
   boolean useWorkersWithDexbuilder();
 
-  @SkylarkCallable(
-      name = "desugar_java8",
-      structField = true,
-      doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+  @SkylarkCallable(name = "desugar_java8", structField = true, doc = "", documented = false)
   boolean desugarJava8();
 
-  @SkylarkCallable(
-      name = "get_output_driecot",
-      structField = true,
-      doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+  @SkylarkCallable(name = "get_output_driecot", structField = true, doc = "", documented = false)
   boolean desugarJava8Libs();
 
-  @SkylarkCallable(
-      name = "check_desugar_deps",
-      structField = true,
-      doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+  @SkylarkCallable(name = "check_desugar_deps", structField = true, doc = "", documented = false)
   boolean checkDesugarDeps();
 
   @SkylarkCallable(
       name = "use_rex_to_compress_dex_files",
       structField = true,
       doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      documented = false)
   boolean useRexToCompressDexFiles();
 
   @SkylarkCallable(
       name = "use_android_resource_shrinking",
       structField = true,
       doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      documented = false)
   boolean useAndroidResourceShrinking();
 
   @SkylarkCallable(
       name = "use_android_resource_cycle_shrinking",
       structField = true,
       doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      documented = false)
   boolean useAndroidResourceCycleShrinking();
 
   @SkylarkCallable(
       name = "use_single_jar_apk_builder",
       structField = true,
       doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      documented = false)
   boolean useSingleJarApkBuilder();
 
-  @SkylarkCallable(
-      name = "use_parallel_dex2oat",
-      structField = true,
-      doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+  @SkylarkCallable(name = "use_parallel_dex2oat", structField = true, doc = "", documented = false)
   boolean useParallelDex2Oat();
 
   @SkylarkCallable(
       name = "compress_java_resources",
       structField = true,
       doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      documented = false)
   boolean compressJavaResources();
 
   @SkylarkCallable(
       name = "get_exports_manifest_default",
       structField = true,
       doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      documented = false)
   boolean getExportsManifestDefault();
 
   @SkylarkCallable(
       name = "use_aapt2_for_robolectric",
       structField = true,
       doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      documented = false)
   boolean useAapt2ForRobolectric();
 
   /**
@@ -223,71 +174,54 @@ public interface AndroidConfigurationApi {
       name = "throw_on_resource_conflict",
       structField = true,
       doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      documented = false)
   boolean throwOnResourceConflict();
 
-  @SkylarkCallable(
-      name = "skip_parsing_action",
-      structField = true,
-      doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+  @SkylarkCallable(name = "skip_parsing_action", structField = true, doc = "", documented = false)
   boolean skipParsingAction();
 
   @SkylarkCallable(
       name = "fixed_resource_neverlinking",
       structField = true,
       doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      documented = false)
   boolean fixedResourceNeverlinking();
 
   @SkylarkCallable(
       name = "check_for_migration_tag",
       structField = true,
       doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      documented = false)
   boolean checkForMigrationTag();
 
   @SkylarkCallable(
       name = "get_one_version_enforcement_use_transitive_jars_for_binary_under_test",
       structField = true,
       doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      documented = false)
   boolean getOneVersionEnforcementUseTransitiveJarsForBinaryUnderTest();
 
-  @SkylarkCallable(
-      name = "use_databinding_v2",
-      structField = true,
-      doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+  @SkylarkCallable(name = "use_databinding_v2", structField = true, doc = "", documented = false)
   boolean useDataBindingV2();
 
   @SkylarkCallable(
       name = "android_databinding_use_v3_4_args",
       structField = true,
       doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      documented = false)
   boolean useDataBindingUpdatedArgs();
 
   @SkylarkCallable(
       name = "persistent_busybox_tools",
       structField = true,
       doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      documented = false)
   boolean persistentBusyboxTools();
 
   @SkylarkCallable(
       name = "get_output_directory_name",
       structField = true,
       doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      documented = false)
   String getOutputDirectoryName();
 }
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidDataProcessingApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidDataProcessingApi.java
index 04e6508e3fc46a..87cfbb89c2351c 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidDataProcessingApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidDataProcessingApi.java
@@ -26,7 +26,6 @@
 import com.google.devtools.build.lib.syntax.EvalException;
 import com.google.devtools.build.lib.syntax.SkylarkDict;
 import com.google.devtools.build.lib.syntax.SkylarkList;
-import com.google.devtools.build.lib.syntax.StarlarkSemantics.FlagIdentifier;
 
 /** Skylark-visible methods for working with Android data (manifests, resources, and assets). */
 @SkylarkModule(
@@ -75,8 +74,7 @@ public interface AndroidDataProcessingApi<
           "Creates an AndroidAssetsInfoApi from this target's asset dependencies, ignoring local"
               + " assets. No processing will be done. This method is deprecated and exposed only"
               + " for backwards-compatibility with existing behavior.",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      documented = false)
   AndroidAssetsInfoT assetsFromDeps(
       SkylarkList<AndroidAssetsInfoT> deps, boolean neverlink, Environment env);
 
@@ -127,8 +125,7 @@ AndroidAssetsInfoT assetsFromDeps(
               + " and exposed only for backwards-compatibility with existing behavior. An empty"
               + " manifest will be generated and included in the provider - this path should  not"
               + " be used when an explicit manifest is specified.",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      documented = false)
   AndroidResourcesInfoT resourcesFromDeps(
       AndroidDataContextT ctx,
       SkylarkList<AndroidResourcesInfoT> deps,
@@ -181,8 +178,7 @@ AndroidResourcesInfoT resourcesFromDeps(
       useLocation = true,
       useEnvironment = true,
       doc = "Stamps a manifest with package information.",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      documented = false)
   AndroidManifestInfoT stampAndroidManifest(
       AndroidDataContextT ctx,
       Object manifest,
@@ -249,8 +245,7 @@ AndroidManifestInfoT stampAndroidManifest(
               + " by default, actions for validating the merge are created but may not be called."
               + " You may want to force these actions to be called - see the 'validation_result'"
               + " field in AndroidAssetsInfoApi",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      documented = false)
   AndroidAssetsInfoT mergeAssets(
       AndroidDataContextT ctx,
       Object assets,
@@ -326,8 +321,7 @@ AndroidAssetsInfoT mergeAssets(
               + " refers to are available. Note that this method might do additional processing to"
               + " this manifest, so in the future, you may want to use the manifest contained in"
               + " this method's output instead of this one.",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      documented = false)
   SkylarkDict<? extends ProviderApi, ? extends StructApi> mergeResources(
       AndroidDataContextT ctx,
       AndroidManifestInfoT manifest,
@@ -402,8 +396,7 @@ AndroidAssetsInfoT mergeAssets(
           "Builds an AAR and corresponding provider for this target. The resource and asset"
               + " providers from this same target must both be passed, as must the class JAR output"
               + " of building the Android Java library.",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      documented = false)
   AndroidLibraryAarInfoT makeAar(
       AndroidDataContextT ctx,
       AndroidResourcesInfoT resourcesInfo,
@@ -536,8 +529,7 @@ AndroidLibraryAarInfoT makeAar(
       doc =
           "Performs full processing of data for android_library or similar rules. Returns a dict"
               + " from provider type to providers for the target.",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      documented = false)
   SkylarkDict<? extends ProviderApi, ? extends StructApi> processLibraryData(
       AndroidDataContextT cotx,
       FileT libraryClassJar,
@@ -592,8 +584,7 @@ AndroidLibraryAarInfoT makeAar(
             doc = "Targets to inherit asset and resource dependencies from.")
       },
       doc = "Processes assets, resources, and manifest for aar_import targets",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      documented = false)
   SkylarkDict<? extends ProviderApi, ? extends StructApi> processAarImportData(
       AndroidDataContextT ctx,
       SpecialFileT resources,
@@ -705,8 +696,7 @@ AndroidLibraryAarInfoT makeAar(
       doc =
           "Processes resources, assets, and manifests for android_local_test and returns a dict"
               + " from provider type to the appropriate provider.",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      documented = false)
   SkylarkDict<? extends ProviderApi, ? extends StructApi> processLocalTestData(
       AndroidDataContextT ctx,
       Object manifest,
@@ -787,8 +777,7 @@ AndroidLibraryAarInfoT makeAar(
       doc =
           "Returns a wrapper object containing various settings shared across multiple methods for"
               + " processing binary data.",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      documented = false)
   AndroidBinaryDataSettingsApi makeBinarySettings(
       AndroidDataContextT ctx,
       Object shrinkResources,
@@ -921,8 +910,7 @@ AndroidBinaryDataSettingsApi makeBinarySettings(
       doc =
           "Processes resources, assets, and manifests for android_binary and returns the"
               + " appropriate providers.",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      documented = false)
   AndroidBinaryDataInfoT processBinaryData(
       AndroidDataContextT ctx,
       SkylarkList<TransitiveInfoCollectionT> resources,
@@ -1013,8 +1001,7 @@ AndroidBinaryDataInfoT processBinaryData(
       doc =
           "Possibly shrinks the data APK by removing resources that were marked as unused during"
               + " proguarding.",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      documented = false)
   AndroidBinaryDataInfoT shrinkDataApk(
       AndroidDataContextT ctx,
       AndroidBinaryDataInfoT binaryDataInfo,
@@ -1033,7 +1020,6 @@ AndroidBinaryDataInfoT shrinkDataApk(
       allowReturnNones = true,
       doc = "Returns an Artifact containing a zip of merged resources.",
       documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS,
       parameters = {
         @Param(
             name = "validated_res",
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidDeviceBrokerInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidDeviceBrokerInfoApi.java
index 0cf86c02a37700..d292cbc97ba175 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidDeviceBrokerInfoApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidDeviceBrokerInfoApi.java
@@ -20,7 +20,6 @@
 import com.google.devtools.build.lib.skylarkinterface.SkylarkConstructor;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkModule;
 import com.google.devtools.build.lib.syntax.EvalException;
-import com.google.devtools.build.lib.syntax.StarlarkSemantics.FlagIdentifier;
 
 /** Supplies the device broker type string, passed to the Android test runtime. */
 @SkylarkModule(
@@ -58,8 +57,7 @@ public interface AndroidDeviceBrokerInfoApiProvider extends ProviderApi {
                   "The type of device broker that is appropriate to use to interact with "
                       + "devices")
         },
-        selfCall = true,
-        enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+        selfCall = true)
     @SkylarkConstructor(objectType = AndroidDeviceBrokerInfoApi.class)
     public AndroidDeviceBrokerInfoApi createInfo(String type) throws EvalException;
   }
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidFeatureFlagSetProviderApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidFeatureFlagSetProviderApi.java
index 6221612573dfde..1ab55d9d880e00 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidFeatureFlagSetProviderApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidFeatureFlagSetProviderApi.java
@@ -24,7 +24,6 @@
 import com.google.devtools.build.lib.skylarkinterface.SkylarkModuleCategory;
 import com.google.devtools.build.lib.syntax.EvalException;
 import com.google.devtools.build.lib.syntax.SkylarkDict;
-import com.google.devtools.build.lib.syntax.StarlarkSemantics.FlagIdentifier;
 
 /** */
 @SkylarkModule(
@@ -44,8 +43,7 @@ public interface AndroidFeatureFlagSetProviderApi extends StructApi {
       name = "flags",
       doc = "Returns the flags contained by the provider.",
       documented = false,
-      structField = true,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      structField = true)
   ImmutableMap<Label, String> getFlagMap();
 
   /** The provider implementing this can construct the AndroidIdeInfo provider. */
@@ -61,7 +59,6 @@ public interface Provider extends ProviderApi {
         name = NAME,
         doc = "The <code>AndroidFeatureFlagSetProvider</code> constructor.",
         documented = false,
-        enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS,
         parameters = {
           @Param(
               name = "flags",
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidIdeInfoProviderApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidIdeInfoProviderApi.java
index 4a43efa34fbbd2..205621f2b3e6a7 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidIdeInfoProviderApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidIdeInfoProviderApi.java
@@ -27,7 +27,6 @@
 import com.google.devtools.build.lib.syntax.SkylarkDict;
 import com.google.devtools.build.lib.syntax.SkylarkList;
 import com.google.devtools.build.lib.syntax.SkylarkNestedSet;
-import com.google.devtools.build.lib.syntax.StarlarkSemantics.FlagIdentifier;
 import javax.annotation.Nullable;
 
 /**
@@ -53,8 +52,7 @@ public interface AndroidIdeInfoProviderApi<
       structField = true,
       doc = "",
       documented = false,
-      allowReturnNones = true,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      allowReturnNones = true)
   @Nullable
   String getJavaPackage();
 
@@ -64,8 +62,7 @@ public interface AndroidIdeInfoProviderApi<
       structField = true,
       doc = "",
       documented = false,
-      allowReturnNones = true,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      allowReturnNones = true)
   @Nullable
   FileT getManifest();
 
@@ -75,8 +72,7 @@ public interface AndroidIdeInfoProviderApi<
       structField = true,
       doc = "",
       documented = false,
-      allowReturnNones = true,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      allowReturnNones = true)
   @Nullable
   FileT getGeneratedManifest();
 
@@ -85,8 +81,7 @@ public interface AndroidIdeInfoProviderApi<
       structField = true,
       doc = "",
       documented = false,
-      allowReturnNones = true,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      allowReturnNones = true)
   @Nullable
   String getIdlImportRoot();
 
@@ -99,8 +94,7 @@ public interface AndroidIdeInfoProviderApi<
       name = "idl_generated_java_files",
       structField = true,
       doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      documented = false)
   ImmutableCollection<FileT> getIdlGeneratedJavaFiles();
 
   @SkylarkCallable(
@@ -108,8 +102,7 @@ public interface AndroidIdeInfoProviderApi<
       structField = true,
       doc = "",
       documented = false,
-      allowReturnNones = true,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      allowReturnNones = true)
   @Nullable
   FileT getIdlSourceJar();
 
@@ -118,8 +111,7 @@ public interface AndroidIdeInfoProviderApi<
       structField = true,
       doc = "",
       documented = false,
-      allowReturnNones = true,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      allowReturnNones = true)
   @Nullable
   FileT getIdlClassJar();
 
@@ -131,8 +123,7 @@ public interface AndroidIdeInfoProviderApi<
       name = "defines_android_resources",
       structField = true,
       doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      documented = false)
   boolean definesAndroidResources();
 
   @SkylarkCallable(
@@ -140,8 +131,7 @@ public interface AndroidIdeInfoProviderApi<
       structField = true,
       doc = "",
       documented = false,
-      allowReturnNones = true,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      allowReturnNones = true)
   @Nullable
   OutputJarT getResourceJar();
 
@@ -150,8 +140,7 @@ public interface AndroidIdeInfoProviderApi<
       structField = true,
       doc = "",
       documented = false,
-      allowReturnNones = true,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      allowReturnNones = true)
   @Nullable
   FileT getResourceApk();
 
@@ -161,8 +150,7 @@ public interface AndroidIdeInfoProviderApi<
       structField = true,
       doc = "",
       documented = false,
-      allowReturnNones = true,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      allowReturnNones = true)
   @Nullable
   FileT getSignedApk();
 
@@ -171,27 +159,16 @@ public interface AndroidIdeInfoProviderApi<
       structField = true,
       doc = "",
       documented = false,
-      allowReturnNones = true,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      allowReturnNones = true)
   @Nullable
   FileT getAar();
 
   /** A list of the APKs related to the app under test, if any. */
-  @SkylarkCallable(
-      name = "apks_under_test",
-      structField = true,
-      doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+  @SkylarkCallable(name = "apks_under_test", structField = true, doc = "", documented = false)
   ImmutableCollection<FileT> getApksUnderTest();
 
   /** A map, keyed on architecture, of the native libs for the app, if any. */
-  @SkylarkCallable(
-      name = "native_libs",
-      structField = true,
-      doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+  @SkylarkCallable(name = "native_libs", structField = true, doc = "", documented = false)
   ImmutableMap<String, SkylarkNestedSet> getNativeLibsSkylark();
 
   /** The provider implementing this can construct the AndroidIdeInfo provider. */
@@ -208,7 +185,6 @@ public interface Provider<FileT extends FileApi, OutputJarT extends OutputJarApi
         name = NAME,
         doc = "The <code>AndroidIdeInfo</code> constructor.",
         documented = false,
-        enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS,
         parameters = {
           @Param(
               name = "java_package",
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidIdlProviderApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidIdlProviderApi.java
index 49205606c66ef9..2d57de2ff8cb1f 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidIdlProviderApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidIdlProviderApi.java
@@ -24,7 +24,6 @@
 import com.google.devtools.build.lib.skylarkinterface.SkylarkModuleCategory;
 import com.google.devtools.build.lib.syntax.EvalException;
 import com.google.devtools.build.lib.syntax.SkylarkNestedSet;
-import com.google.devtools.build.lib.syntax.StarlarkSemantics.FlagIdentifier;
 
 /**
  * Configured targets implementing this provider can contribute Android IDL information to the
@@ -48,8 +47,7 @@ public interface AndroidIdlProviderApi<FileT extends FileApi> extends StructApi
       name = "transitive_idl_import_roots",
       structField = true,
       doc = "Returns a depset of strings of all the idl import roots.",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      documented = false)
   NestedSet<String> getTransitiveIdlImportRoots();
 
   /** The IDL files in the transitive closure. */
@@ -57,8 +55,7 @@ public interface AndroidIdlProviderApi<FileT extends FileApi> extends StructApi
       name = "transitive_idl_imports",
       structField = true,
       doc = "Returns a depset of artifacts of all the idl imports.",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      documented = false)
   NestedSet<FileT> getTransitiveIdlImports();
 
   /** The IDL jars in the transitive closure, both class and source jars. */
@@ -66,8 +63,7 @@ public interface AndroidIdlProviderApi<FileT extends FileApi> extends StructApi
       name = "transitive_idl_jars",
       structField = true,
       doc = "Returns a depset of artifacts of all the idl class and source jars.",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      documented = false)
   NestedSet<FileT> getTransitiveIdlJars();
 
   /** The preprocessed IDL files in the transitive closure. */
@@ -75,8 +71,7 @@ public interface AndroidIdlProviderApi<FileT extends FileApi> extends StructApi
       name = "transitive_idl_preprocessed",
       structField = true,
       doc = "Returns a depset of artifacts of all the idl preprocessed files.",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      documented = false)
   NestedSet<FileT> getTransitiveIdlPreprocessed();
 
   /** The provider implementing this can construct the AndroidIdlInfo provider. */
@@ -92,7 +87,6 @@ public interface Provider<FileT extends FileApi> extends ProviderApi {
         name = NAME,
         doc = "The <code>AndroidIdlInfo</code> constructor.",
         documented = false,
-        enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS,
         parameters = {
           @Param(
               name = "transitive_idl_import_roots",
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidInstrumentationInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidInstrumentationInfoApi.java
index 7601da884c4805..ec9dc5b6ad2bfd 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidInstrumentationInfoApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidInstrumentationInfoApi.java
@@ -22,7 +22,6 @@
 import com.google.devtools.build.lib.skylarkinterface.SkylarkModule;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkModuleCategory;
 import com.google.devtools.build.lib.syntax.EvalException;
-import com.google.devtools.build.lib.syntax.StarlarkSemantics.FlagIdentifier;
 
 /**
  * A provider for targets that create Android instrumentations. Consumed by Android testing rules.
@@ -53,8 +52,7 @@ public interface AndroidInstrumentationInfoApi<FileT extends FileApi> extends St
       name = "instrumentation_apk",
       doc = "Returns the instrumentation APK that should be executed.",
       documented = false,
-      structField = true,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      structField = true)
   FileT getInstrumentationApk();
 
   /** Provider for {@link AndroidInstrumentationInfoApi}. */
@@ -71,7 +69,6 @@ public interface AndroidInstrumentationInfoApiProvider<FileT extends FileApi>
         name = "AndroidInstrumentationInfo",
         doc = "The <code>AndroidInstrumentationInfo</code> constructor.",
         documented = false,
-        enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS,
         parameters = {
           @Param(
               name = "target_apk",
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidLibraryAarInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidLibraryAarInfoApi.java
index 163ea6fbaf4719..d2467f9e74a51f 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidLibraryAarInfoApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidLibraryAarInfoApi.java
@@ -19,7 +19,6 @@
 import com.google.devtools.build.lib.skylarkinterface.SkylarkCallable;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkModule;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkModuleCategory;
-import com.google.devtools.build.lib.syntax.StarlarkSemantics.FlagIdentifier;
 
 /** A target that can provide the aar artifact of Android libraries */
 @SkylarkModule(
@@ -40,15 +39,13 @@ public interface AndroidLibraryAarInfoApi<FileT extends FileApi> extends StructA
       doc = "",
       documented = false,
       structField = true,
-      allowReturnNones = true,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      allowReturnNones = true)
   FileT getAarArtifact();
 
   @SkylarkCallable(
       name = "transitive_aar_artifacts",
       doc = "",
       documented = false,
-      structField = true,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      structField = true)
   NestedSet<FileT> getTransitiveAarArtifacts();
 }
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidLibraryResourceClassJarProviderApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidLibraryResourceClassJarProviderApi.java
index dae9da6d1e5c4f..6b6a87fcd09c3c 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidLibraryResourceClassJarProviderApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidLibraryResourceClassJarProviderApi.java
@@ -24,7 +24,6 @@
 import com.google.devtools.build.lib.skylarkinterface.SkylarkModuleCategory;
 import com.google.devtools.build.lib.syntax.EvalException;
 import com.google.devtools.build.lib.syntax.SkylarkNestedSet;
-import com.google.devtools.build.lib.syntax.StarlarkSemantics.FlagIdentifier;
 
 /** Provides resource class jars from android_library rules. */
 @SkylarkModule(
@@ -40,12 +39,7 @@ public interface AndroidLibraryResourceClassJarProviderApi<FileT extends FileApi
   /** The name of the provider for this info object. */
   String NAME = "AndroidLibraryResourceClassJarProvider";
 
-  @SkylarkCallable(
-      name = "jars",
-      structField = true,
-      doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+  @SkylarkCallable(name = "jars", structField = true, doc = "", documented = false)
   NestedSet<FileT> getResourceClassJars();
 
   /** The provider implementing this can construct the AndroidLibraryResourceClassJarProvider. */
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidManifestInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidManifestInfoApi.java
index 58c55dd860c527..7af2cf5f8ba80c 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidManifestInfoApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidManifestInfoApi.java
@@ -18,7 +18,6 @@
 import com.google.devtools.build.lib.skylarkinterface.SkylarkCallable;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkModule;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkModuleCategory;
-import com.google.devtools.build.lib.syntax.StarlarkSemantics.FlagIdentifier;
 
 /** A provider of information about this target's manifest. */
 @SkylarkModule(
@@ -38,23 +37,20 @@ public interface AndroidManifestInfoApi<FileT extends FileApi> extends StructApi
       name = "manifest",
       doc = "This target's manifest, merged with manifests from dependencies",
       documented = false,
-      structField = true,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      structField = true)
   FileT getManifest();
 
   @SkylarkCallable(
       name = "package",
       doc = "This target's package",
       documented = false,
-      structField = true,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      structField = true)
   String getPackage();
 
   @SkylarkCallable(
       name = "exports_manifest",
       doc = "If this manifest should be exported to targets that depend on it",
       documented = false,
-      structField = true,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      structField = true)
   boolean exportsManifest();
 }
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidNativeLibsInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidNativeLibsInfoApi.java
index 825d4ec88071a6..d67812210f4014 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidNativeLibsInfoApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidNativeLibsInfoApi.java
@@ -23,7 +23,6 @@
 import com.google.devtools.build.lib.skylarkinterface.SkylarkModule;
 import com.google.devtools.build.lib.syntax.EvalException;
 import com.google.devtools.build.lib.syntax.SkylarkNestedSet;
-import com.google.devtools.build.lib.syntax.StarlarkSemantics.FlagIdentifier;
 
 /**
  * Provider of transitively available ZIPs of native libs that should be directly copied into the
@@ -46,8 +45,7 @@ public interface AndroidNativeLibsInfoApi<FileT extends FileApi> extends StructA
       name = "native_libs",
       doc = "Returns the native libraries produced by the rule.",
       documented = false,
-      structField = true,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      structField = true)
   NestedSet<FileT> getNativeLibs();
 
   /** Provider for {@link AndroidNativeLibsInfoApi}. */
@@ -63,7 +61,6 @@ public interface AndroidNativeLibsInfoApiProvider extends ProviderApi {
         name = "AndroidNativeLibsInfo",
         doc = "The <code>AndroidNativeLibsInfo</code> constructor.",
         documented = false,
-        enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS,
         parameters = {
           @Param(
               name = "native_libs",
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidPreDexJarProviderApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidPreDexJarProviderApi.java
index 3456c8730e654f..ca570cbe465c84 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidPreDexJarProviderApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidPreDexJarProviderApi.java
@@ -23,7 +23,6 @@
 import com.google.devtools.build.lib.skylarkinterface.SkylarkModule;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkModuleCategory;
 import com.google.devtools.build.lib.syntax.EvalException;
-import com.google.devtools.build.lib.syntax.StarlarkSemantics.FlagIdentifier;
 
 /** A provider of the final Jar to be dexed for targets that build APKs. */
 @SkylarkModule(
@@ -39,12 +38,7 @@ public interface AndroidPreDexJarProviderApi<FileT extends FileApi> extends Stru
   String NAME = "AndroidPreDexJarInfo";
 
   /** Returns the jar to be dexed. */
-  @SkylarkCallable(
-      name = "pre_dex_jar",
-      structField = true,
-      doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+  @SkylarkCallable(name = "pre_dex_jar", structField = true, doc = "", documented = false)
   FileT getPreDexJar();
 
   /** The provider implementing this can construct the AndroidPreDexJarInfo provider. */
@@ -60,7 +54,6 @@ public interface Provider<FileT extends FileApi> extends ProviderApi {
         name = NAME,
         doc = "The <code>AndroidPreDexJarInfo</code> constructor.",
         documented = false,
-        enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS,
         parameters = {
           @Param(
               name = "pre_dex_jar",
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidProguardInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidProguardInfoApi.java
index 22ab89bd3b1841..8bfa902e62fff1 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidProguardInfoApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidProguardInfoApi.java
@@ -23,7 +23,6 @@
 import com.google.devtools.build.lib.skylarkinterface.SkylarkModule;
 import com.google.devtools.build.lib.syntax.EvalException;
 import com.google.devtools.build.lib.syntax.SkylarkList;
-import com.google.devtools.build.lib.syntax.StarlarkSemantics.FlagIdentifier;
 
 /** A target that can provide local proguard specifications. */
 @SkylarkModule(
@@ -40,8 +39,7 @@ public interface AndroidProguardInfoApi<FileT extends FileApi> extends StructApi
       name = "local_proguard_specs",
       structField = true,
       doc = "Returns the local proguard specs defined by this target.",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      documented = false)
   ImmutableList<FileT> getLocalProguardSpecs();
 
   /** The provider implementing this can construct the AndroidProguardInfo provider. */
@@ -57,7 +55,6 @@ public interface Provider<F extends FileApi> extends ProviderApi {
         name = NAME,
         doc = "The <code>AndroidProguardInfo</code> constructor.",
         documented = false,
-        enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS,
         parameters = {
           @Param(
               name = "local_proguard_specs",
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidResourcesInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidResourcesInfoApi.java
index 7bbb4581fe4fe6..b0e580e4f70831 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidResourcesInfoApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidResourcesInfoApi.java
@@ -25,7 +25,6 @@
 import com.google.devtools.build.lib.skylarkinterface.SkylarkModuleCategory;
 import com.google.devtools.build.lib.syntax.EvalException;
 import com.google.devtools.build.lib.syntax.SkylarkNestedSet;
-import com.google.devtools.build.lib.syntax.StarlarkSemantics.FlagIdentifier;
 
 /** A provider that supplies resource information from its transitive closure. */
 @SkylarkModule(
@@ -52,16 +51,10 @@ public interface AndroidResourcesInfoApi<
       name = "label",
       doc = "Returns the label that is associated with this piece of information.",
       documented = false,
-      structField = true,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      structField = true)
   Label getLabel();
 
-  @SkylarkCallable(
-      name = "manifest",
-      doc = "",
-      documented = false,
-      structField = true,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+  @SkylarkCallable(name = "manifest", doc = "", documented = false, structField = true)
   AndroidManifestInfoT getManifest();
 
   /** Returns the compiletime r.txt file for the target. */
@@ -72,8 +65,7 @@ public interface AndroidResourcesInfoApi<
               + " stubbed out compiletime file and should not be built into APKs, inherited from"
               + " dependencies, or used at runtime.",
       documented = false,
-      structField = true,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      structField = true)
   FileT getRTxt();
 
   /** Returns the transitive ResourceContainers for the label. */
@@ -81,8 +73,7 @@ public interface AndroidResourcesInfoApi<
       name = "transitive_android_resources",
       doc = "Returns the transitive ResourceContainers for the label.",
       documented = false,
-      structField = true,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      structField = true)
   NestedSet<ValidatedAndroidDataT> getTransitiveAndroidResources();
 
   /** Returns the immediate ResourceContainers for the label. */
@@ -90,64 +81,40 @@ public interface AndroidResourcesInfoApi<
       name = "direct_android_resources",
       doc = "Returns the immediate ResourceContainers for the label.",
       documented = false,
-      structField = true,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      structField = true)
   NestedSet<ValidatedAndroidDataT> getDirectAndroidResources();
 
-  @SkylarkCallable(
-      name = "transitive_resources",
-      doc = "",
-      documented = false,
-      structField = true,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+  @SkylarkCallable(name = "transitive_resources", doc = "", documented = false, structField = true)
   NestedSet<FileT> getTransitiveResources();
 
-  @SkylarkCallable(
-      name = "transitive_manifests",
-      doc = "",
-      documented = false,
-      structField = true,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+  @SkylarkCallable(name = "transitive_manifests", doc = "", documented = false, structField = true)
   NestedSet<FileT> getTransitiveManifests();
 
   @SkylarkCallable(
       name = "transitive_aapt2_r_txt",
       doc = "",
       documented = false,
-      structField = true,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      structField = true)
   NestedSet<FileT> getTransitiveAapt2RTxt();
 
   @SkylarkCallable(
       name = "transitive_symbols_bin",
       doc = "",
       documented = false,
-      structField = true,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      structField = true)
   NestedSet<FileT> getTransitiveSymbolsBin();
 
   @SkylarkCallable(
       name = "transitive_compiled_symbols",
       doc = "",
       documented = false,
-      structField = true,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      structField = true)
   NestedSet<FileT> getTransitiveCompiledSymbols();
 
-  @SkylarkCallable(
-      name = "transitive_static_lib",
-      doc = "",
-      documented = false,
-      structField = true,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+  @SkylarkCallable(name = "transitive_static_lib", doc = "", documented = false, structField = true)
   NestedSet<FileT> getTransitiveStaticLib();
 
-  @SkylarkCallable(
-      name = "transitive_r_txt",
-      doc = "",
-      documented = false,
-      structField = true,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+  @SkylarkCallable(name = "transitive_r_txt", doc = "", documented = false, structField = true)
   NestedSet<FileT> getTransitiveRTxt();
 
   /** Provider for {@link AndroidResourcesInfoApi}. */
@@ -167,7 +134,6 @@ public interface AndroidResourcesInfoApiProvider<
         name = "AndroidResourcesInfo",
         doc = "The <code>AndroidResourcesInfo</code> constructor.",
         documented = false,
-        enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS,
         parameters = {
           @Param(
               name = "label",
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidSdkProviderApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidSdkProviderApi.java
index e7f2674e5c1067..9f7d1f0e962a51 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidSdkProviderApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidSdkProviderApi.java
@@ -23,7 +23,6 @@
 import com.google.devtools.build.lib.skylarkinterface.SkylarkConstructor;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkModule;
 import com.google.devtools.build.lib.syntax.EvalException;
-import com.google.devtools.build.lib.syntax.StarlarkSemantics.FlagIdentifier;
 import javax.annotation.Nullable;
 
 /**
@@ -46,12 +45,7 @@ public interface AndroidSdkProviderApi<
   String NAME = "AndroidSdkInfo";
 
   /** The value of build_tools_version. May be null or empty. */
-  @SkylarkCallable(
-      name = "build_tools_version",
-      structField = true,
-      doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+  @SkylarkCallable(name = "build_tools_version", structField = true, doc = "", documented = false)
   String getBuildToolsVersion();
 
   @SkylarkCallable(
@@ -59,8 +53,7 @@ public interface AndroidSdkProviderApi<
       structField = true,
       doc = "",
       documented = false,
-      allowReturnNones = true,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      allowReturnNones = true)
   FileT getFrameworkAidl();
 
   @SkylarkCallable(
@@ -68,17 +61,11 @@ public interface AndroidSdkProviderApi<
       structField = true,
       doc = "",
       documented = false,
-      allowReturnNones = true,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      allowReturnNones = true)
   @Nullable
   TransT getAidlLib();
 
-  @SkylarkCallable(
-      name = "android_jar",
-      structField = true,
-      doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+  @SkylarkCallable(name = "android_jar", structField = true, doc = "", documented = false)
   FileT getAndroidJar();
 
   @SkylarkCallable(
@@ -86,65 +73,29 @@ public interface AndroidSdkProviderApi<
       structField = true,
       doc = "",
       documented = false,
-      allowReturnNones = true,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      allowReturnNones = true)
   @Nullable
   FileT getSourceProperties();
 
-  @SkylarkCallable(
-      name = "shrinked_android_jar",
-      structField = true,
-      doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+  @SkylarkCallable(name = "shrinked_android_jar", structField = true, doc = "", documented = false)
   FileT getShrinkedAndroidJar();
 
-  @SkylarkCallable(
-      name = "main_dex_classes",
-      structField = true,
-      doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+  @SkylarkCallable(name = "main_dex_classes", structField = true, doc = "", documented = false)
   FileT getMainDexClasses();
 
-  @SkylarkCallable(
-      name = "adb",
-      structField = true,
-      doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+  @SkylarkCallable(name = "adb", structField = true, doc = "", documented = false)
   FilesToRunProviderT getAdb();
 
-  @SkylarkCallable(
-      name = "dx",
-      structField = true,
-      doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+  @SkylarkCallable(name = "dx", structField = true, doc = "", documented = false)
   FilesToRunProviderT getDx();
 
-  @SkylarkCallable(
-      name = "main_dex_list_creator",
-      structField = true,
-      doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+  @SkylarkCallable(name = "main_dex_list_creator", structField = true, doc = "", documented = false)
   FilesToRunProviderT getMainDexListCreator();
 
-  @SkylarkCallable(
-      name = "aidl",
-      structField = true,
-      doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+  @SkylarkCallable(name = "aidl", structField = true, doc = "", documented = false)
   FilesToRunProviderT getAidl();
 
-  @SkylarkCallable(
-      name = "aapt",
-      structField = true,
-      doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+  @SkylarkCallable(name = "aapt", structField = true, doc = "", documented = false)
   FilesToRunProviderT getAapt();
 
   @SkylarkCallable(
@@ -152,8 +103,7 @@ public interface AndroidSdkProviderApi<
       structField = true,
       doc = "",
       documented = false,
-      allowReturnNones = true,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      allowReturnNones = true)
   @Nullable
   FilesToRunProviderT getAapt2();
 
@@ -162,33 +112,17 @@ public interface AndroidSdkProviderApi<
       structField = true,
       doc = "",
       documented = false,
-      allowReturnNones = true,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      allowReturnNones = true)
   @Nullable
   FilesToRunProviderT getApkBuilder();
 
-  @SkylarkCallable(
-      name = "apk_signer",
-      structField = true,
-      doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+  @SkylarkCallable(name = "apk_signer", structField = true, doc = "", documented = false)
   FilesToRunProviderT getApkSigner();
 
-  @SkylarkCallable(
-      name = "proguard",
-      structField = true,
-      doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+  @SkylarkCallable(name = "proguard", structField = true, doc = "", documented = false)
   FilesToRunProviderT getProguard();
 
-  @SkylarkCallable(
-      name = "zip_align",
-      structField = true,
-      doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+  @SkylarkCallable(name = "zip_align", structField = true, doc = "", documented = false)
   FilesToRunProviderT getZipalign();
 
   /** The provider implementing this can construct the AndroidSdkInfo provider. */
@@ -208,7 +142,6 @@ public interface Provider<
         name = NAME,
         doc = "The <code>AndroidSdkInfo</code> constructor.",
         documented = false,
-        enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS,
         parameters = {
           @Param(
               name = "build_tools_version",
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidSkylarkApiProviderApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidSkylarkApiProviderApi.java
index 963ace1ef8bf1c..be95a45d02453e 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidSkylarkApiProviderApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidSkylarkApiProviderApi.java
@@ -21,7 +21,6 @@
 import com.google.devtools.build.lib.skylarkinterface.SkylarkCallable;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkModule;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkModuleCategory;
-import com.google.devtools.build.lib.syntax.StarlarkSemantics.FlagIdentifier;
 import javax.annotation.Nullable;
 
 /**
@@ -46,8 +45,7 @@ public interface AndroidSkylarkApiProviderApi<FileT extends FileApi> {
       structField = true,
       allowReturnNones = true,
       doc = "Returns an APK produced by this target.",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      documented = false)
   @Nullable
   FileT getApk();
 
@@ -56,8 +54,7 @@ public interface AndroidSkylarkApiProviderApi<FileT extends FileApi> {
       structField = true,
       allowReturnNones = true,
       doc = "Returns a java package for this target.",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      documented = false)
   @Nullable
   String getJavaPackage();
 
@@ -66,8 +63,7 @@ public interface AndroidSkylarkApiProviderApi<FileT extends FileApi> {
       structField = true,
       allowReturnNones = true,
       doc = "Returns a manifest file for this target.",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      documented = false)
   @Nullable
   FileT getManifest();
 
@@ -76,8 +72,7 @@ public interface AndroidSkylarkApiProviderApi<FileT extends FileApi> {
       structField = true,
       allowReturnNones = true,
       doc = "Returns a manifest file for this target after all processing, e.g.: merging, etc.",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      documented = false)
   @Nullable
   FileT getMergedManifest();
 
@@ -88,8 +83,7 @@ public interface AndroidSkylarkApiProviderApi<FileT extends FileApi> {
           "Returns the native libraries as a dictionary of the libraries' architecture as a string "
               + "to a set of the native library files, or the empty dictionary if there are no "
               + "native libraries.",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      documented = false)
   ImmutableMap<String, NestedSet<FileT>> getNativeLibs();
 
   @SkylarkCallable(
@@ -97,7 +91,6 @@ public interface AndroidSkylarkApiProviderApi<FileT extends FileApi> {
       structField = true,
       doc = "Returns the resources container for the target.",
       documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS,
       allowReturnNones = true)
   @Nullable
   FileT getResourceApk();
@@ -107,8 +100,7 @@ public interface AndroidSkylarkApiProviderApi<FileT extends FileApi> {
       structField = true,
       allowReturnNones = true,
       doc = "Returns a collection of APKs that this target tests.",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      documented = false)
   @Nullable
   ImmutableCollection<FileT> getApksUnderTest();
 
@@ -116,24 +108,21 @@ public interface AndroidSkylarkApiProviderApi<FileT extends FileApi> {
       name = "defines_resources",
       structField = true,
       doc = "Returns <code>True</code> if the target defines any Android resources directly.",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      documented = false)
   boolean definesAndroidResources();
 
   @SkylarkCallable(
       name = "idl",
       structField = true,
       doc = "Returns information about IDL files associated with this target.",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      documented = false)
   IdlInfoApi<FileT> getIdlInfo();
 
   @SkylarkCallable(
       name = "resources",
       structField = true,
       doc = "Returns resources defined by this target.",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      documented = false)
   NestedSet<FileT> getResources();
 
   @SkylarkCallable(
@@ -141,8 +130,7 @@ public interface AndroidSkylarkApiProviderApi<FileT extends FileApi> {
       structField = true,
       allowReturnNones = true,
       doc = "Returns a jar file for classes generated from resources.",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      documented = false)
   @Nullable
   OutputJarApi<FileT> getResourceJar();
 
@@ -151,8 +139,7 @@ public interface AndroidSkylarkApiProviderApi<FileT extends FileApi> {
       structField = true,
       allowReturnNones = true,
       doc = "Returns the aar output of this target.",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      documented = false)
   @Nullable
   FileT getAar();
 
@@ -171,8 +158,7 @@ interface IdlInfoApi<FileT extends FileApi> {
         structField = true,
         allowReturnNones = true,
         doc = "Returns the root of IDL packages if not the java root.",
-        documented = false,
-        enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+        documented = false)
     @Nullable
     String getImportRoot();
 
@@ -180,16 +166,14 @@ interface IdlInfoApi<FileT extends FileApi> {
         name = "sources",
         structField = true,
         doc = "Returns a list of IDL files.",
-        documented = false,
-        enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+        documented = false)
     ImmutableCollection<FileT> getSources();
 
     @SkylarkCallable(
         name = "generated_java_files",
         structField = true,
         doc = "Returns a list Java files generated from IDL sources.",
-        documented = false,
-        enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+        documented = false)
     ImmutableCollection<FileT> getIdlGeneratedJavaFiles();
 
     @SkylarkCallable(
@@ -197,8 +181,7 @@ interface IdlInfoApi<FileT extends FileApi> {
         structField = true,
         allowReturnNones = true,
         doc = "Returns a jar file for classes generated from IDL sources.",
-        documented = false,
-        enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+        documented = false)
     @Nullable
     OutputJarApi<FileT> getIdlOutput();
   }
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidSkylarkCommonApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidSkylarkCommonApi.java
index ebe2549f0fcf5b..164f92b1296b3b 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidSkylarkCommonApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidSkylarkCommonApi.java
@@ -34,7 +34,6 @@ public interface AndroidSkylarkCommonApi<FileT extends FileApi, JavaInfoT extend
   @SkylarkCallable(
       name = "create_device_broker_info",
       documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS,
       parameters = {@Param(name = "type", type = String.class)})
   AndroidDeviceBrokerInfoApi createDeviceBrokerInfo(String deviceBrokerType);
 
@@ -47,7 +46,6 @@ public interface AndroidSkylarkCommonApi<FileT extends FileApi, JavaInfoT extend
               + "a directory that designates resource kind (cf. "
               + "http://developer.android.com/guide/topics/resources/providing-resources.html).",
       documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS,
       parameters = {
         @Param(
             name = "resource",
@@ -64,7 +62,6 @@ public interface AndroidSkylarkCommonApi<FileT extends FileApi, JavaInfoT extend
           "A configuration for rule attributes that compiles native code according to "
               + "the --fat_apk_cpu and --android_crosstool_top flags.",
       documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS,
       structField = true)
   AndroidSplitTransititionApi getAndroidSplitTransition();
 
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/ApkInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/ApkInfoApi.java
index 13f5a2569c648f..91305f5f438493 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/ApkInfoApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/ApkInfoApi.java
@@ -23,7 +23,6 @@
 import com.google.devtools.build.lib.skylarkinterface.SkylarkModuleCategory;
 import com.google.devtools.build.lib.syntax.EvalException;
 import com.google.devtools.build.lib.syntax.SkylarkDict;
-import com.google.devtools.build.lib.syntax.StarlarkSemantics.FlagIdentifier;
 
 /** A provider for targets that produce an apk file. */
 @SkylarkModule(
@@ -54,8 +53,7 @@ public interface ApkInfoApi<FileT extends FileApi> extends StructApi {
       name = "unsigned_apk",
       doc = "Returns a unsigned APK built from the target.",
       documented = false,
-      structField = true,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      structField = true)
   FileT getUnsignedApk();
 
   /** Returns keystore that was used to sign the APK */
@@ -63,8 +61,7 @@ public interface ApkInfoApi<FileT extends FileApi> extends StructApi {
       name = "keystore",
       doc = "Returns a keystore that was used to sign the APK.",
       documented = false,
-      structField = true,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      structField = true)
   FileT getKeystore();
 
   /** Provider for {@link ApkInfoApi}. */
@@ -80,7 +77,6 @@ public interface ApkInfoApiProvider extends ProviderApi {
         name = "ApkInfo",
         // This is left undocumented as it throws a "not-implemented in Skylark" error when invoked.
         documented = false,
-        enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS,
         extraKeywords = @Param(name = "kwargs"),
         useLocation = true,
         selfCall = true)
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/DataBindingV2ProviderApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/DataBindingV2ProviderApi.java
index 8696119337193a..0c3f2c0ae9e7e1 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/DataBindingV2ProviderApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/DataBindingV2ProviderApi.java
@@ -25,7 +25,6 @@
 import com.google.devtools.build.lib.skylarkinterface.SkylarkModule;
 import com.google.devtools.build.lib.syntax.EvalException;
 import com.google.devtools.build.lib.syntax.SkylarkList;
-import com.google.devtools.build.lib.syntax.StarlarkSemantics.FlagIdentifier;
 import javax.annotation.Nullable;
 
 /**
@@ -65,12 +64,7 @@ public static LabelJavaPackagePair create(String label, String javaPackage) {
    * android_libraries in the exports attribute, where the providers from exports are merged into a
    * single provider. In a rule without exports, this will be at most 1 file.
    */
-  @SkylarkCallable(
-      name = "setter_stores",
-      structField = true,
-      doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+  @SkylarkCallable(name = "setter_stores", structField = true, doc = "", documented = false)
   ImmutableList<T> getSetterStores();
 
   /**
@@ -78,42 +72,32 @@ public static LabelJavaPackagePair create(String label, String javaPackage) {
    * android_libraries in the exports attribute, where the providers from exports are merged into a
    * single provider. In a rule without exports, this will be at most 1 file.
    */
-  @SkylarkCallable(
-      name = "class_infos",
-      structField = true,
-      doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+  @SkylarkCallable(name = "class_infos", structField = true, doc = "", documented = false)
   ImmutableList<T> getClassInfos();
 
   /** Returns the BR files from this rule and its dependencies. */
-  @SkylarkCallable(
-      name = "transitive_br_files",
-      structField = true,
-      doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+  @SkylarkCallable(name = "transitive_br_files", structField = true, doc = "", documented = false)
   NestedSet<T> getTransitiveBRFiles();
 
   /**
    * Returns a NestedSet containing the label and java package for this rule and its transitive
    * dependencies.
-   */
+   * */
   @SkylarkCallable(
       name = "transitive_label_and_java_packages",
       structField = true,
       doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      documented = false)
   NestedSet<LabelJavaPackagePair> getTransitiveLabelAndJavaPackages();
 
-  /** Returns the label and java package for this rule and any rules that this rule exports. */
+  /**
+   * Returns the label and java package for this rule and any rules that this rule exports.
+   */
   @SkylarkCallable(
       name = "label_and_java_packages",
       structField = true,
       doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+      documented = false)
   @Nullable
   ImmutableList<LabelJavaPackagePair> getLabelAndJavaPackages();
 
@@ -130,7 +114,6 @@ public interface Provider<F extends FileApi> extends ProviderApi {
         name = NAME,
         doc = "The <code>DataBindingV2Info</code> constructor.",
         documented = false,
-        enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS,
         parameters = {
           @Param(
               name = "setter_store_file",
@@ -189,4 +172,4 @@ DataBindingV2ProviderApi<F> createInfo(
         SkylarkList<DataBindingV2ProviderApi<F>> databindingV2ProvidersInExports)
         throws EvalException;
   }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/UsesDataBindingProviderApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/UsesDataBindingProviderApi.java
index e5ac63db8a73f7..8327e6e5b67b20 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/UsesDataBindingProviderApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/UsesDataBindingProviderApi.java
@@ -23,7 +23,6 @@
 import com.google.devtools.build.lib.skylarkinterface.SkylarkModule;
 import com.google.devtools.build.lib.syntax.EvalException;
 import com.google.devtools.build.lib.syntax.SkylarkList;
-import com.google.devtools.build.lib.syntax.StarlarkSemantics.FlagIdentifier;
 
 /**
  * An interface for a provider that exposes the use of <a
@@ -44,12 +43,7 @@ public interface UsesDataBindingProviderApi<T extends FileApi> extends StructApi
    * Returns the metadata outputs from this rule's annotation processing that describe how it
    * applies data binding. See {@link DataBinding#getMetadataOutputs} for details.
    */
-  @SkylarkCallable(
-      name = "metadata_outputs",
-      structField = true,
-      doc = "",
-      documented = false,
-      enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS)
+  @SkylarkCallable(name = "metadata_outputs", structField = true, doc = "", documented = false)
   ImmutableList<T> getMetadataOutputs();
 
   /** The provider implementing this can construct the UsesDataBindingInfo provider. */
@@ -65,7 +59,6 @@ public interface Provider<F extends FileApi> extends ProviderApi {
         name = NAME,
         doc = "The <code>UsesDataBindingInfo</code> constructor.",
         documented = false,
-        enableOnlyWithFlag = FlagIdentifier.EXPERIMENTAL_ENABLE_ANDROID_MIGRATION_APIS,
         parameters = {
           @Param(
               name = "metadata_outputs",
diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java
index 2a15313bbd233c..d2eb7e07482ab2 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java
@@ -97,7 +97,6 @@ public void createFiles() throws Exception {
 
   @Test
   public void testAndroidSplitTransitionWithInvalidCpu() throws Exception {
-    setSkylarkSemanticsOptions("--experimental_enable_android_migration_apis");
     scratch.file(
         "test/skylark/my_rule.bzl",
         "def impl(ctx): ",
@@ -3315,7 +3314,6 @@ public void testFeatureFlagsAttributeSetsFeatureFlagProviderValues() throws Exce
     useConfiguration(
         "--experimental_dynamic_configs=notrim",
         "--enforce_transitive_configs_for_config_feature_flag");
-    setSkylarkSemanticsOptions("--experimental_enable_android_migration_apis");
     scratch.file(
         "java/com/foo/reader.bzl",
         "def _impl(ctx):",
@@ -4141,7 +4139,6 @@ public void testOnlyOneLibraryJar() throws Exception {
 
   @Test
   public void testApkInfoAccessibleFromSkylark() throws Exception {
-    setSkylarkSemanticsOptions("--experimental_enable_android_migration_apis");
     scratch.file(
         "java/com/google/android/BUILD",
         "load(':postprocess.bzl', 'postprocess')",
@@ -4164,7 +4161,6 @@ public void testApkInfoAccessibleFromSkylark() throws Exception {
 
   @Test
   public void testInstrumentationInfoAccessibleFromSkylark() throws Exception {
-    setSkylarkSemanticsOptions("--experimental_enable_android_migration_apis");
     scratch.file(
         "java/com/google/android/instr/BUILD",
         "load(':instr.bzl', 'instr')",
@@ -4193,7 +4189,6 @@ public void testInstrumentationInfoAccessibleFromSkylark() throws Exception {
 
   @Test
   public void testInstrumentationInfoCreatableFromSkylark() throws Exception {
-    setSkylarkSemanticsOptions("--experimental_enable_android_migration_apis");
     scratch.file(
         "java/com/google/android/instr/BUILD",
         "load(':instr.bzl', 'instr')",
@@ -4465,7 +4460,6 @@ public void testAapt1BuildsWithAapt2Sdk() throws Exception {
 
   @Test
   public void skylarkJavaInfoToAndroidBinaryAttributes() throws Exception {
-    setSkylarkSemanticsOptions("--experimental_enable_android_migration_apis");
     scratch.file(
         "java/r/android/extension.bzl",
         "def _impl(ctx):",
diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidInstrumentationTestTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidInstrumentationTestTest.java
index d6332038263e2c..93b6241aa937d8 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidInstrumentationTestTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidInstrumentationTestTest.java
@@ -231,7 +231,6 @@ public void testInstrumentationBinaryIsInstrumenting() throws Exception {
   @Test
   public void testAndroidInstrumentationTestWithSkylarkDevice()
       throws Exception {
-    setSkylarkSemanticsOptions("--experimental_enable_android_migration_apis");
     scratch.file(
         "javatests/com/app/skylarkdevice/local_adb_device.bzl",
         "def _impl(ctx):",
diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidSkylarkTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidSkylarkTest.java
index f05d274d7305f0..e208591ea6e709 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidSkylarkTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidSkylarkTest.java
@@ -33,7 +33,6 @@
 public class AndroidSkylarkTest extends BuildViewTestCase {
 
   private void writeAndroidSplitTransitionTestFiles() throws Exception  {
-    setSkylarkSemanticsOptions("--experimental_enable_android_migration_apis");
     scratch.file(
         "test/skylark/my_rule.bzl",
         "def impl(ctx): ",
@@ -169,7 +168,6 @@ public void testAndroidSplitTransitionNoTransition() throws Exception {
 
   @Test
   public void testAndroidSdkConfigurationField() throws Exception {
-    setSkylarkSemanticsOptions("--experimental_enable_android_migration_apis");
     scratch.file(
         "foo_library.bzl",
         "def _impl(ctx):",
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java
index 54bd0bcc273d3b..8668dc875c2848 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java
@@ -2713,7 +2713,6 @@ public void testConfigurationField_NativeSplitTransitionProviderProhibited() thr
 
   @Test
   public void testConfigurationField_NativeSplitTransitionProhibited() throws Exception {
-    setSkylarkSemanticsOptions("--experimental_enable_android_migration_apis");
     scratch.file(
         "test/rule.bzl",
         "def _foo_impl(ctx):",
diff --git a/src/test/java/com/google/devtools/build/skydoc/testdata/android_basic_test/input.bzl b/src/test/java/com/google/devtools/build/skydoc/testdata/android_basic_test/input.bzl
index a479fb68738aee..b06291a8d7fd0a 100644
--- a/src/test/java/com/google/devtools/build/skydoc/testdata/android_basic_test/input.bzl
+++ b/src/test/java/com/google/devtools/build/skydoc/testdata/android_basic_test/input.bzl
@@ -1,3 +1,15 @@
+def exercise_the_api():
+    _var1 = android_common.create_device_broker_info("")
+    _var2 = ApkInfo
+    _var3 = AndroidInstrumentationInfo
+    _var4 = AndroidDeviceBrokerInfo
+    _var5 = AndroidResourcesInfo
+    _var6 = AndroidNativeLibsInfo
+    _var7 = AndroidSdkInfo
+    _var8 = android_data
+
+exercise_the_api()
+
 def my_rule_impl(ctx):
     return struct()