Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 69cc50f1e8  -s ours
am: 42facf05ce  -s ours

* commit '42facf05ce7a7b21667335bba2f942ca2eda873d':
  Import translations. DO NOT MERGE