d2usc: House warming

Change-Id: If99a9c4521598f6535a188a5621a8e75d2429125