Getting lined up with changes to support device names and enumeration.

Change-Id: I8e2f1c3d965045cd477ec5fd3408966cc0a50491
2 files changed