D2 is annoyingly deunified,

I tried reunifying, but I need some help with the python based scripts

Change-Id: I9b28aaaf21d94f73fa7e4ba45d9dd7763eff29ca