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

Change-Id: Ic4735df4076debec8f0d9622d6bcf8658a9a0c54