Dependencies fix

Change-Id: Iaea6fb3476f27376141b205312f936bc34801b1c