fix for conflicts with d2

Change-Id: I7e92f54a20be6a613cb4f7b54e011e564166c619