Dependencies fix

Change-Id: I3ba37a32bdf4d04d8df259905e3804db8e9657fa