Merge "Make sure that the device name is not null before returning it" am:...
Merge "Make sure that the device name is not null before returning it" am: d4963e80 am: 87d114ac am: c6438a68
am: 70b3e387
Change-Id: I12902cef94e1311831a4c7ac5de76d75e411648b