Change Dependendies to corect ones

Change-Id: I10fabd56fef8002f6141f6548a16905e12e944e8