[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 673c0661db  -s ours

Change-Id: Ib4e8aac3ce349f215e6d62cfafe169b407dbe248