Merge \\\"Fix a race in local settings caches\\\" into nyc-dev am: f4ddb7ce30 am: 8011f5ed1c
am: 798ca67212

Change-Id: I411309f2c585a1ed15483e78bb7df292cd840633