Merge hack patch for DI

Change-Id: Iacb2441181cfb8c7ecea00d153122a950e971f14