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

Change-Id: I83d95004dbb353c6b6657091845ea02358ce10bb