Merge "Revert "Mark empty LocalVariableList as sorted"" am: e2eee30d45
am: 410922cee2

Change-Id: Id0b67a030a59f56fbbb291f88a11b11f96c66ae5