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
am: 1aa0c2a939  -s ours

Change-Id: I9e9c9397e11c0d7e01c1ddd70d751aa1da0f7db8