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

Change-Id: Ib1eae543579908fe40c51186f7ab54fdde52b4a9