Remove d2to dependency

Change-Id: I1d4778ec85676217b1c7710c8df9a8c427ae35ca
Merge "Remove d2to dependency"