Updating DI to master

Change-Id: Iced042777199e62a786f3e20a146979aedf3ef3d