Merge "Merge "Show only up to two locales in Settings" into nyc-dev am:...
Merge "Merge "Show only up to two locales in Settings" into nyc-dev am: a260cf89" into nyc-mr1-dev
am: ed922ce2
* commit 'ed922ce2':
Change-Id: I8c3f2d29a706f65d406ff23e01e560ec53512707