am 6f259bcb: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master

* commit '6f259bcb110c0e014bae48f6a3bbfe594c4c5fb9':
  Import translations. DO NOT MERGE