d2: fix inheritant issues

Change-Id: I38a5d77b4b815efae6b304ba5ffbe0bc6ad66fee