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

Change-Id: If8cfc5a620170e94c17259cc3cd6852830e3c068