Bind fingerprint when we start authentication - DO NOT MERGE am: b6f4b48d am: 9f049859 am: 85c390e9 -s ours am: f159feff Change-Id: I48332039882c1367989424c5005c5b60df8bc7a0