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

Change-Id: Ic07ebace6f152785992299c4d3f166cbfe836911