Change up dependencies.

Change-Id: Iacb14b892c3e226c118d2c94b8e654975dd67c15