Merge "Bind fingerprint when we start authentication" into nyc-mr1-dev