Updating DI to master again

Change-Id: Iada564a74f2115fdd1a5f9050465439755ca66f9