Bind fingerprint when we start authentication - DO NOT MERGE am: b6f4b48df2 am: 9f04985991 am: 85c390e9fb  -s ours
am: f159feff98

Change-Id: I1064ef601b45a43ea248fbf6d5dd0194d0d61288