Dependencies fix

Change-Id: I5f9a01f8fe37be077e53cc8a257eeb0f8d4a9f0e