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

Change-Id: I07ac3fe88dd7acc7ced6b4483d98efe1797bea21