Merge "Remove reference to fingerprint.goldfish" into rvc-dev