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

Change-Id: Iae82bd5f96f1b36899ac2315232349c319b30cac