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

Change-Id: Idb0594bb6d1f2188ff0682f08227a939a8cc6b1f