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

Change-Id: Id5f67e95a9cd3751e8d1613048806dc43dfcca90