Merge pull request #138933 from Luflosi/update/java-service-wrapper
authored by Sandro and committed by GitHub 4 years ago c3b941a1 88469690