(cherry picked from commit 772db515934b79ef407b4213087c15035588d9ad) # Conflicts: # gradle/libs.versions.toml