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

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