1 files changed, 5 insertions, 1 deletions
diff --git a/src/objc_tools/plmerge/java/com/google/devtools/build/xcode/plmerge/PlMerge.java b/src/objc_tools/plmerge/java/com/google/devtools/build/xcode/plmerge/PlMerge.java
index c07a8992b5..ea13c29ab9 100644
--- a/src/objc_tools/plmerge/java/com/google/devtools/build/xcode/plmerge/PlMerge.java
+++ b/src/objc_tools/plmerge/java/com/google/devtools/build/xcode/plmerge/PlMerge.java
@@ -89,7 +89,11 @@ public class PlMerge {
 
     PlistMerging merging = PlistMerging.from(sourceFilePaths, ImmutableMap.<String, NSObject>of(),
         ImmutableMap.<String, String>of(), new KeysToRemoveIfEmptyString());
-    merging.setBundleIdentifier(options.primaryBundleId, options.fallbackBundleId);
+    if (options.primaryBundleId != null || options.fallbackBundleId != null) {
+      // Only set the bundle identifier if we were passed arguments to do so.
+      // This prevents CFBundleIdentifiers being put into strings files.
+      merging.setBundleIdentifier(options.primaryBundleId, options.fallbackBundleId);
+    }
     merging.writePlist(fileSystem.getPath(options.outFile));
   }