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

Change-Id: I18521a6e144f71d49817661306fdbdda914cc03c