Merge "PackageNamePermissionQuery uid->userId"