Add d2cri and d2usc

Change-Id: I8f46a236a19e388a404e091627bad93a6a171ae0