Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 3af6f0a522  -s ours

Change-Id: I1fe88b7b0563a2b6fc87ab5189219a2ea93fb0d1