Merge "Fix some top-level settings not updating with language" into nyc-dev am: ed70356506
am: 7e1b47347a
am: 1412c15769
* commit '1412c15769d8a1587ee7168c44449aa15caf284e':
Change-Id: I1916ff7e1b4affc4b29062331914a917cefdc45c
This commit is contained in: