Merge "fuzz_service_test: test restore calling ID"