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

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

Change-Id: I5218e8c0b3481bda6fda7ae2f951e1db45b5da6e