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

Change-Id: Ie9ae5227e1c09e1d4fab3274ebf25be29f4f122d