Merge "Don't do the SAW perm check if there's an invalid UID" into rvc-dev