Merge "Revert "Sort LocalVariableList""
am: f075a6760b

Change-Id: I5134fbb25d4fa5de6b07046eabf97b00d61b7bdf