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

Change-Id: Ifc8de89a4a967ec7dec9daed5fa436fd6d84fd34