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

Change-Id: If21a25dbaa50054b40c8266f3401c5ddeb3a8575