Merge "Revert "renaming/removing fingerprints should be reflected in UI if...
Merge "Revert "renaming/removing fingerprints should be reflected in UI if fingerprintservice lags"" into oc-dev am: 7ad05fb1
am: 5e4facb6
Change-Id: I6f3198dace607a7a89ad312a159aaa3c2bafebeb