Alphasort devices

Change-Id: I4c4c6b8c730efa458d63d95c792525a5d7c6102f
Merge "Alphasort devices"