Merge "Skip adding value lines for accidental matches." am: 42f4d9810f
am: 042fb19356

Change-Id: Ia4e8f5bda94eec31f0a11228bd36367756ddc693