DI to master

Change-Id: I238a3241f4e8ae069e434c01b1c8675fdb47acd1