D2MTR: House warming

Change-Id: Ie229573a6dceb9a39b073e900ad1153b59f2985d