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

Change-Id: Ic82a0428aa7f5d78a71f8d82a8b35cf709a19d1d