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

Change-Id: I17a1313244d56f6e416f5a0252ee3f6681e19763