Merge "Updated the fuzzer to use native service"