Merge "Don't expose default strong auth timeout as constant" into nyc-mr1-dev