Merge "Revert "Sort LocalVariableList"" am: f075a6760b
am: f5b346a621

Change-Id: Ied64ef0760af401553dd2361604d0f0f82756277