Add device_id support

Change-Id: I0630ccaa9a79bc296e5bba5052621e1272496841