Merge "Use device type to show corresponding icon and name" into rvc-dev am:...
Merge "Use device type to show corresponding icon and name" into rvc-dev am: ea93f91f am: 444e39bc am: 696fbf4e am: 8cb3dabb
Change-Id: Ia1404a3d987d978aa060683ee49cc24953206b85