Set dependencies right

Change-Id: I77f674bf6e70d6dd0d400677802c9b247824d455