Merge "Ignore edit list if values don't make sense" am: ec40ae247d am: 28d0762b10
am: 6e7843873c

Change-Id: I3063205b762aa260d23ef47705f06d9698e13335