d2att: House warming

Change-Id: I1b4a95a81c6bbfc31556b1ef5baa4f876d295cfc