Move not needed dependencies up

Change-Id: I47b4a6006dd4a0e6b7fd015d6974c81511d65971
Merge "Move not needed dependencies up"