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