Support d2usc

Change-Id: Id5bfb72a17c8b2db2d9941008bcf3dbcd5e4363b
Support d2cri

Change-Id: Ia9612b31be6f8c17ae2bb5dc1b5953319f3fd312
Fix up d2 aka GS3 additions

Change-Id: I161195011df0b4065fabe19032c9454fc5b4d109
Signed-off-by: DHOMD <DHO@dho.im>