Merge "Fingerprint Strong auth timeout" into nyc-mr1-dev
am: 69659cb96d

Change-Id: Ia4053b06fe434a61b11037ee250c2edc9689b06b