Merge "Revert "Mark empty LocalVariableList as sorted"" am: e2eee30d am: 410922ce am: da8916e8 am: f49b4c3a Change-Id: I344608adc75fc70aebdcefa6c9c651ba59ea9ef3