corrected dependencies, part 2

Change-Id: I81d5c75d248c235770cf4243df4e09433231af98