Revert "Do not merge. Return null id for Non-phone device."

This reverts commit cea03df201dc6659654234bc5fbfebf1b6a06e42
1 file changed