Merge "Make sure that the device name is not null before returning it"
am: d4963e8035

Change-Id: Ia9f3baa2e1c78bb1ebde2be9a412d96f76e5a225