Merge "Enable fingerprint in care_map"
am: f3d0e4783f

Change-Id: I9e15e8eb029b6da6142fd87318452a144f8c0a6a