Merge "Show only up to two locales in Settings" into nyc-dev am: a260cf8931
am: aacca81c31
* commit 'aacca81c314d9f5b677427dfc4c2cadfa194f4fb':
Change-Id: Ic00a466681fac4393990d17fc3eefa24486eb26b
This commit is contained in: