Merge "Bind fingerprint when we start authentication - DO NOT MERGE" into mnc-dr-dev am: 02e9affa42 am: ddf70b9195 am: 364a51221a  -s ours am: ce0856f702
am: 78ec20382a

Change-Id: Ib8c45277048ad72043739892b19814e4451f15f4