fixup dependencies

Change-Id: I6a7210510d2584cc87ca88b5701eb6bd409bc98a