More removing cyclic dependencies
More removing cyclic dependencies
More removing cyclic dependencies
More removing cyclic dependencies
Repairing build.gradle