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

Change-Id: I0a55bc85c506c8f4d10e4a730e2547f13ebfef14