diff --git a/common/util/src/com/android/compatibility/common/util/BusinessLogicExecutor.java b/common/util/src/com/android/compatibility/common/util/BusinessLogicExecutor.java
index c214329..34f98d7 100644
--- a/common/util/src/com/android/compatibility/common/util/BusinessLogicExecutor.java
+++ b/common/util/src/com/android/compatibility/common/util/BusinessLogicExecutor.java
@@ -98,10 +98,11 @@
 
     /** Substitute sensitive information with REDACTED_PLACEHOLDER if necessary. */
     protected static String[] formatArgs(String[] args) {
-        for (int i = 0; i < args.length; i++) {
-            args[i] = formatArg(args[i]);
+        List<String> formattedArgs = new ArrayList<>();
+        for (String arg : args) {
+            formattedArgs.add(formatArg(arg));
         }
-        return args;
+        return formattedArgs.toArray(new String[0]);
     }
 
     private static String formatArg(String arg) {