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

Change-Id: I2da2738345bc63e1f40f8f9d6e8215b770cc93b4