Merge "Use device type to show corresponding icon and name" into rvc-dev am: ea93f91f2c am: 444e39bc03 am: d1105d2a38

Change-Id: I33d02e553e3980f01a3d979d5a519c8b1ee27e28