Merge "Don't expose default strong auth timeout as constant" into nyc-mr1-dev am: a6b3caf58e
am: 949a485e29

Change-Id: I65369538db700b4b8de7385c57242a5e5b7e922e