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

Change-Id: I874a58ecc54ddd46837c6e21b6244e5bb40312d7