Merge "renaming/removing fingerprints should be reflected in UI immediately" into oc-dev am: 1a199ba7e1
am: 7b1e255bff

Change-Id: I7508c6e731acf54e71a40b840aba3acad3eadf48