[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: a737ae8f0d -s ours am: 850e3c7f69 -s ours
am: 7f92027e2f -s ours
am skip reason: subject contains skip directive

Change-Id: I9e2fdedb2796d6efdceb5a2fa8ab3dfab2d2a97f