Merge "Fix some top-level settings not updating with language" into nyc-dev...
Merge "Fix some top-level settings not updating with language" into nyc-dev am: ed703565 am: 4f63855b
am: 7dc82939
* commit '7dc82939':
Fix some top-level settings not updating with language
Change-Id: Ib65a09bf6d46eedd7cb6dd28fe70ecadb6ce1e46