Has the side effect of picking up changes to LocalePicker that added support for 3 letter language codes. bug: 10090157 (cherry picked from commit 26edbccb58) Change-Id: I0f41f27e3e6eb88f0265c9ef6b3f34df04bfff1b
26edbccb58
BUG: 9926077 Change-Id: Iea141d5d6fd0e4f134c36c51d89830b3c31abd09