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: I4ac8f75786f2e3f1584ecf6c0a924999034825c2