* commit '8cb7a969c5017c20b5eb0911ec8af4322daa8023': Don't assume languages are 2 letter codes. Switch TextUtils over to new ICU API.
* commit '8cb7a969c5017c20b5eb0911ec8af4322daa8023': Don't assume languages are 2 letter codes. Switch TextUtils over to new ICU API.