diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index bb19394123..7117fbdd68 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -284,6 +284,9 @@ Release 2.7.0 - UNRELEASED
     YARN-3124. Fixed CS LeafQueue/ParentQueue to use QueueCapacities to track
     capacities-by-label. (Wangda Tan via jianhe)
 
+    YARN-3158. Correct log messages in ResourceTrackerService.
+    (Varun Saxena via xgong)
+
   OPTIMIZATIONS
 
     YARN-2990. FairScheduler's delay-scheduling always waits for node-local and 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceTrackerService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceTrackerService.java
index 4beb895a8a..61a03499cc 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceTrackerService.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceTrackerService.java
@@ -209,14 +209,14 @@ void handleNMContainerStatus(NMContainerStatus containerStatus, NodeId nodeId) {
     if (rmApp == null) {
       LOG.error("Received finished container : "
           + containerStatus.getContainerId()
-          + "for unknown application " + appAttemptId.getApplicationId()
+          + " for unknown application " + appAttemptId.getApplicationId()
           + " Skipping.");
       return;
     }
 
     if (rmApp.getApplicationSubmissionContext().getUnmanagedAM()) {
       if (LOG.isDebugEnabled()) {
-        LOG.debug("Ignoring container completion status for unmanaged AM"
+        LOG.debug("Ignoring container completion status for unmanaged AM "
             + rmApp.getApplicationId());
       }
       return;