Further fix dependencies because it was jacked

Change-Id: I36469a9ed0490764b5a35f40b9931acc37dfbf35