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