Change more incorrect dependencies

Change-Id: If273110f9a7e59edf5d86a5d4bd7e59ebbfa74d9