diff --git a/launcher/src/main/java/org/apache/spark/launcher/AbstractCommandBuilder.java b/launcher/src/main/java/org/apache/spark/launcher/AbstractCommandBuilder.java
index de2b175608b10..cd0584a99c80d 100644
--- a/launcher/src/main/java/org/apache/spark/launcher/AbstractCommandBuilder.java
+++ b/launcher/src/main/java/org/apache/spark/launcher/AbstractCommandBuilder.java
@@ -295,10 +295,9 @@ Properties loadPropertiesFile() throws IOException {
       FileInputStream fd = null;
       try {
         fd = new FileInputStream(propsFile);
-        Properties rawProps = new Properties();
-        rawProps.load(new InputStreamReader(fd, "UTF-8"));
-        for (String str : rawProps.stringPropertyNames()) {
-          props.setProperty(str, rawProps.getProperty(str).trim());
+        props.load(new InputStreamReader(fd, "UTF-8"));
+        for (Map.Entry<Object, Object> e : props.entrySet()) {
+            e.setValue(e.getValue().toString().trim());
         }
       } finally {
         if (fd != null) {