Merge \"Update fingerprint strings\" into nyc-mr1-dev
am: 3edc1645a5

Change-Id: Iba1d9f5cc70db4e192f4fd428d505a2ec33fc217