Merge "Update fingerprint strings" into nyc-mr1-dev