Fix code bug for removing cyclic dependency and fix unit test. Test: hmake test Change-Id: Ib4d4ba416d0133542e6459459ddf43079ff53ab8
Change-Id: Ic8dc81a437d9c72e841048359745e245c6c4895b