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

Change-Id: Ie1b2dd5295272eb2bcc538b7b49fc397a9515ea7