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

Change-Id: Ieb112eb6d02af1a1300d303f0e13dec4164afbe2