Resynced project with Gradle files to fix issues