Merge "Handle missing FingerprintManager." into nyc-support-25.1-dev