Merge "[Fingerprint] Update strings" into nyc-dev