Merge "Fingerprint string updates" into nyc-mr1-dev