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