Fix dependencies

Change-Id: I93de716f8b706ab61e87abfe7528f887cba0cb17