Fix dependencies...AGAIN

Change-Id: I746c529801ec771ec91050ec011aa8fee80ae779