Merge "Sort devices list before output." am: 18cdd3502a am: e93f4e82ad
am: 62e480bcb9

Change-Id: I9b0c7b13b21c4c38babb069dc7cedaa15dfc580a