Fix dependencies

Change-Id: Ibc2c22a9253526088afadedb3f07cc9abc0cbd99