Merge "Remove the service declaration check in the JNI waitForService wrapper." into main