Merge "set calling UID in fuzzService"