diff --git a/common/Android.bp b/common/Android.bp
index ff4de11f50..e10ede8f62 100644
--- a/common/Android.bp
+++ b/common/Android.bp
@@ -19,6 +19,10 @@ package {
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
+// This is a placeholder comment to avoid merge conflicts
+// as the above target may not exist
+// depending on the branch
+
 java_library {
     name: "connectivity-net-module-utils-bpf",
     srcs: [
diff --git a/common/flags.aconfig b/common/flags.aconfig
new file mode 100644
index 0000000000..4926503e08
--- /dev/null
+++ b/common/flags.aconfig
@@ -0,0 +1,8 @@
+package: "com.android.net.flags"
+
+flag {
+  name: "track_multiple_network_activities"
+  namespace: "android_core_networking"
+  description: "NetworkActivityTracker tracks multiple networks including non default networks"
+  bug: "267870186"
+}