Fix dependencies

Change-Id: Idc6da009eeeb7d269f43bf3b534ae3345f59b8c5