Import translations. DO NOT MERGE
am: 7eeb016fdd  -s ours

Change-Id: I0c3faa0ad6760b35f3a7eb8d85d0908228297b8d