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

This reverts commit cea03df201dc6659654234bc5fbfebf1b6a06e42

Change-Id: I68470e729d9304f1c27473a71334e1b0de99ff01
1 file changed