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: 289eb5b8 am: 65d142ba am: 92ae6eeb
Change-Id: I699d73f0506b307aa3e3ea3113b17a56d46dfc68