Merge "Sort LocalVariableList"
am: f4da03e8b1

Change-Id: I1b1dbcedc6f3a8026ae2a783e25e5134ae987df0