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

Change-Id: I327a2e711f2a810cdc6d9561cff1eb22f094869e