Gradle conversion commit for v1.30
2nd attempt at 1.30 Gradle commit.
3rd try, for 1.30