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

Change-Id: Ifa27bd520c871831bd438668086c7288f8422ef8