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

Change-Id: I7db4b76189530be74f6cd8fb8bf745ca03a6556e