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

Change-Id: I5d14abcfb338399d31da5e8cf67672320b8a07a7