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

Change-Id: I8308733be4ac586377b0545057dbf982875e4da5