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

Change-Id: I48332039882c1367989424c5005c5b60df8bc7a0