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

Change-Id: I8c8bee720224e7c774a58421022f87fea4839f4a