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

Change-Id: Ifdc1768b626fafe4b9c33fd279ae1c0f20a80d65