Merge "Fingerprint Strong auth timeout" into nyc-mr1-dev