Merge "Merge "[Fingerprint] Update strings" into nyc-dev am: 498ec55ba3
am: 2ad9f41310" into nyc-mr1-dev-plus-aosp
am: 0da23fd0cb
* commit '0da23fd0cbec84f72ece710667284a78b19c7ed8':
Change-Id: Ia179be6060710d1b84f831498d9d441e366a370c
This commit is contained in: