Dependencies fix

Change-Id: Ib47f2b60de6ff3206270f947364dbe30245d0a53