Remove d2to dependency

Change-Id: I433711ba417dbb15f616fa488cec389f3138b00a
Merge "Remove d2to dependency"