Remove circular dependency

Change-Id: Ic0d36934b40ced90564a1e1ad79ec1138fd39767