Merge "fingerprint: Fix BuildFingerprint" into rvc-dev