Merge "Enable fingerprint in care_map" am: f3d0e4783f
am: 881f4225f2

Change-Id: I73b319d426896550e5ed037dd7f69de030ff2c46