Fix dependencies

Change-Id: I65ab5de8f3391f3da0c0d381a4b4b1bcbb18527f