Merge "Remove vestigial 'sortlist' code"
am: e0f89a03b7

Change-Id: I5064cd80f675bae7ed3f3d3a4b1f2764ed2cf093