Merge "Make sure that the device name is not null before returning it" into oc-dev
am: 0f20dcdcb0

Change-Id: I7d2a4101ebe29892e3dd365dc5531866bc8d3b2c