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
am: a7025c283c

Change-Id: Id53a357acd6b5ac900963d216aaf441471991f3a