Clean up device list - do not merge

Change-Id: Ib6b4bb49b7658370cff64124731bb0a06a116c44
1 file changed