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

Change-Id: I69228a84fa8f9102d07703d7257b7796b5c45f8d