Merge "Use Settings.Secure for days to retain." into nyc-mr1-dev