diff --git a/build/config/ios/rules.gni b/build/config/ios/rules.gni
index b0ab6f59d92953..2ab3cda0b9da41 100644
--- a/build/config/ios/rules.gni
+++ b/build/config/ios/rules.gni
@@ -533,11 +533,7 @@ template("ios_info_plist") {
 
   apple_info_plist(target_name) {
     format = "binary1"
-    extra_substitutions = []
-    if (defined(invoker.extra_substitutions)) {
-      extra_substitutions = invoker.extra_substitutions
-    }
-    extra_substitutions += [
+    extra_substitutions = [
       "IOS_BUNDLE_ID_PREFIX=$ios_app_bundle_id_prefix",
       "IOS_PLATFORM_BUILD=$ios_platform_build",
       "IOS_PLATFORM_NAME=$ios_sdk_name",
@@ -550,6 +546,9 @@ template("ios_info_plist") {
       "XCODE_BUILD=$xcode_build",
       "XCODE_VERSION=$xcode_version",
     ]
+    if (defined(invoker.extra_substitutions)) {
+      extra_substitutions += invoker.extra_substitutions
+    }
     plist_templates = [
       "//build/config/ios/BuildInfo.plist",
       _info_plist,
@@ -830,18 +829,16 @@ template("ios_app_bundle") {
     ios_info_plist(_generate_info_plist) {
       forward_variables_from(invoker,
                              [
-                               "extra_substitutions",
                                "info_plist",
                                "info_plist_target",
                              ])
 
       executable_name = _output_name
 
-      if (!defined(extra_substitutions)) {
-        extra_substitutions = []
+      extra_substitutions = [ "BUNDLE_IDENTIFIER=$_bundle_identifier" ]
+      if (defined(invoker.extra_substitutions)) {
+        extra_substitutions += invoker.extra_substitutions
       }
-
-      extra_substitutions += [ "BUNDLE_IDENTIFIER=$_bundle_identifier" ]
     }
 
     if (!is_fat_secondary_toolchain) {
@@ -1557,16 +1554,14 @@ template("ios_framework_bundle") {
       executable_name = _output_name
       forward_variables_from(invoker,
                              [
-                               "extra_substitutions",
                                "info_plist",
                                "info_plist_target",
                              ])
 
-      if (!defined(extra_substitutions)) {
-        extra_substitutions = []
+      extra_substitutions = [ "BUNDLE_IDENTIFIER=$_bundle_identifier" ]
+      if (defined(invoker.extra_substitutions)) {
+        extra_substitutions += invoker.extra_substitutions
       }
-
-      extra_substitutions += [ "BUNDLE_IDENTIFIER=$_bundle_identifier" ]
     }
 
     bundle_data(_info_plist_bundle) {
diff --git a/build/config/mac/rules.gni b/build/config/mac/rules.gni
index 7753a97fe753a3..03073f830401c4 100644
--- a/build/config/mac/rules.gni
+++ b/build/config/mac/rules.gni
@@ -40,11 +40,7 @@ template("mac_info_plist") {
 
   apple_info_plist(target_name) {
     format = "xml1"
-    extra_substitutions = []
-    if (defined(invoker.extra_substitutions)) {
-      extra_substitutions = invoker.extra_substitutions
-    }
-    extra_substitutions += [
+    extra_substitutions = [
       "MAC_SDK_BUILD=$mac_sdk_version",
       "MAC_SDK_NAME=$mac_sdk_name$mac_sdk_version",
       "MACOSX_DEPLOYMENT_TARGET=$mac_deployment_target",
@@ -52,6 +48,9 @@ template("mac_info_plist") {
       "XCODE_BUILD=$xcode_build",
       "XCODE_VERSION=$xcode_version",
     ]
+    if (defined(invoker.extra_substitutions)) {
+      extra_substitutions += invoker.extra_substitutions
+    }
     plist_templates = [
       "//build/config/mac/BuildInfo.plist",
       _info_plist,
diff --git a/ios/chrome/test/earl_grey2/chrome_ios_eg2_test.gni b/ios/chrome/test/earl_grey2/chrome_ios_eg2_test.gni
index 840de3fd1639da..f3f9eaf0c0cf40 100644
--- a/ios/chrome/test/earl_grey2/chrome_ios_eg2_test.gni
+++ b/ios/chrome/test/earl_grey2/chrome_ios_eg2_test.gni
@@ -131,10 +131,7 @@ template("chrome_ios_eg2_test_app_host") {
       ios_application_icons_target,
     ]
 
-    if (!defined(extra_substitutions)) {
-      extra_substitutions = []
-    }
-    extra_substitutions += [
+    extra_substitutions = [
       "CHROMIUM_BUNDLE_ID=$bundle_identifier",
       "CHROMIUM_HANDOFF_ID=$chromium_handoff_id",
       "CHROMIUM_SHORT_NAME=$target_name",