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

Change-Id: I00bf39a6af5b3b06f7a6727ab0df581f5d1bed52