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

Change-Id: Ifc27631ac1ecfd7c86ecc18bab8e2cb207682351