De unified d2

Change-Id: I1d449957bb0a60073a6bdf01a417ea7e3631524b