d2: Unify d2 devices.

Change-Id: I37880a9d622830e1e073856b9b82d4502f246f38