Fix dependency loop

Change-Id: Icc9dd91f78f6cc2b6b84d79cc5f516d6f76e4a75