Merge "Add historical logging to settings provider" into nyc-mr1-dev