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

Change-Id: I2aaaecd00927ea1dd00ad9a493f5c58a3bc4ddf6