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

Change-Id: I0122c66ccf6131da3fb3d62a42bdf7ef7a4cc417