Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 97bf3b5922  -s ours
am: 82ab657901  -s ours

* commit '82ab657901ef66fba38c67d7c6589d22cc82e3dd':
  Import translations. DO NOT MERGE