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

Change-Id: I346e4f52c9d413e6e7b1af9dac1bc88545fb7769