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: 41d1827fd3

Change-Id: I305d7afc49624716b67dd1d54ea13b3f76cd2216