Merge "Revert "Sort LocalVariableList""