Remove d2to dependency

Change-Id: If904845f3ba4ceeffe8bd685a947873a0d9420b6
Merge "Remove d2to dependency"