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

* commit 'e0eafa8d55997cc1c7ba66e9e2e499343d85a675':

Change-Id: Ib4146b311ed6a860aa3e6e77c37021115bc641a9