Use device id for internal and device name to display. Change-Id: Id32cd69ffc48876754d48653349cb78cb2025362