More dependencies

Change-Id: If3dd0991eb4965c2320b5b04586a29b4a2874248