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

Change-Id: Idd0b306aa3d756ac3ca5b00db5f07c044fb7595a