diff --git a/src/com/android/contacts/editor/CompactRawContactsEditorView.java b/src/com/android/contacts/editor/CompactRawContactsEditorView.java
index b5f46f7..eadebc8 100644
--- a/src/com/android/contacts/editor/CompactRawContactsEditorView.java
+++ b/src/com/android/contacts/editor/CompactRawContactsEditorView.java
@@ -710,7 +710,7 @@
 
                 vlog("parse: " + i + " " + dataKind.mimeType + " " +
                         kindSectionData.getValuesDeltas().size() + " value(s) " +
-                        kindSectionData.getNonEmptyValuesDeltas().size() + " non-empty value(s)" +
+                        kindSectionData.getNonEmptyValuesDeltas().size() + " non-empty value(s) " +
                         kindSectionData.getVisibleValuesDeltas().size() +
                         " visible value(s)");
             }
diff --git a/src/com/android/contacts/editor/KindSectionData.java b/src/com/android/contacts/editor/KindSectionData.java
index bd9f687..7e2899f 100644
--- a/src/com/android/contacts/editor/KindSectionData.java
+++ b/src/com/android/contacts/editor/KindSectionData.java
@@ -53,12 +53,12 @@
         return valuesDeltas == null ? new ArrayList<ValuesDelta>() : valuesDeltas;
     }
 
-    /** Returns visible and non no-op ValuesDeltas for the data kind this section represents. */
+    /** Returns visible and non deleted ValuesDeltas for the data kind this section represents. */
     public List<ValuesDelta> getVisibleValuesDeltas() {
         final ArrayList<ValuesDelta> valuesDeltas = new ArrayList<> ();
         for (ValuesDelta valuesDelta : getValuesDeltas()) {
             // Same conditions as KindSectionView#rebuildFromState
-            if (valuesDelta.isVisible() && !valuesDelta.isNoop()) {
+            if (valuesDelta.isVisible() && !valuesDelta.isDelete()) {
                 valuesDeltas.add(valuesDelta);
             }
         }
