Change-Id: Iebfa52cb849d69974c94902b0b020893cf5618a3
Has the side effect of picking up changes to LocalePicker that added support for 3 letter language codes. bug: 10090157 Change-Id: I20b357c8a3e76c7cecdf623d9ed39c3751d07645
BUG: 9926077 Change-Id: Iea141d5d6fd0e4f134c36c51d89830b3c31abd09