Merge "Invalidate caches when locale changes." into nyc-dev am: e141241
am: 5239ac8

* commit '5239ac8d0a708873ad77d855f412f5b110306135':
  Invalidate caches when locale changes.

Change-Id: I2192a88a53b4b174e053504799435ee0cd39cae0