Dependency fix

Change-Id: Id6d15f0110032c7c31f909d072529a9c56908942