Merge pull request #19135 from smowton/smowton/admin/test-gradle-bom-…

Merge pull request #19135 from smowton/smowton/admin/test-gradle-bom-… #8687