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

Change-Id: I1d859808485d2e75220da9cc41cdf8b945475a82