Merge "Bind fingerprint when we start authentication" into nyc-mr1-dev am: e11059694a
am: a39117959d

Change-Id: I49dfe17253201e29f2ab8380a4cbbb5bc073f0e1