Merge "Merge \\\"Fix a race in local settings caches\\\" into nyc-dev am: f4ddb7ce am: 8011f5ed am: 798ca672"