am 8dd412a9: Merge from AOSP

* commit '8dd412a900c73144b0d868e3e872938052071d95':
  English must be the first language specified