Merge "Fix permission check in reset_uid and clear_uid"