Merge "Don't expose default strong auth timeout as constant" into nyc-mr1-dev am: a6b3caf5 am: 949a485e am: 736ba341 Change-Id: Ide6ca9a88541252da54050c4e3412d5f21f33e59