Make return value of defaultsort more explicit

In a seperate commit to prevent a big rebase mess.

Change-Id: I5300844e8c992014ecb13e9eaa77cdc56e1678b5
Merge "Make return value of defaultsort more explicit"