d2: Unify d2 devices

Change-Id: I99ca6e624cbccb05feaa240437fd15e1d49362f6