Unify d2's

Change-Id: I3b2c93e3c6739c65868d8a27b3577c51ba510727