Merge "Allow edit list atom to appear earlier in the file"
am: c71583ee52

Change-Id: I47e5508ba8abcf13fbabb63a8eab5344b69c4932