add d2-common

Change-Id: I6d7f3bb8ea1cdcc2393633624b27a92968f41e7d
fix error path

Change-Id: I293e12e8cf7a58d2cce472b97cd03f5724bb22b6