Fix dependencies

Change-Id: I98ee06eaa5c8bfdf60c19bf8d5f24213d74ca376