d2spr: House warming

Change-Id: I2671be202d1f4700cb4c539ced2c76f3e61641c2