Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 31f0d18a03  -s ours

* commit '31f0d18a03115ba4a112af14fd007a2e9e7c4d72':
  Import translations. DO NOT MERGE