Merge "Used checkPackage to check UID and package" into rvc-dev