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

Change-Id: I17fb77cc9c5fa185114180bb23f6b8e41c3eb2b2