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

Change-Id: Iccf0d83b5bbf076684343a0979d7eac718be0603