(cherry picked from commit 99f12b1fbf950596a5ba13b78fd856bbac5082ad) # Conflicts: # gradle/libs.versions.toml