Merge "Ensure local settings caches are not stale" into nyc-dev am: f71d7fe
am: d4bc15b

* commit 'd4bc15b66be44af031f5e78574781b8f21923404':
  Ensure local settings caches are not stale

Change-Id: Ibc39ab132c0ba4d86e54f5797609569abf42d0d2