Remove circular dependency.

Change-Id: Iec202ca256158ed4d021bbac943d1b1fb5d15e7d
1 file changed