d2vzw: House warming

Change-Id: I0b81386d32ef092e0d9793630396fda52bc1b54f