Import translations. DO NOT MERGE
am: 34f5924ca6  -s ours

Change-Id: Iddaaa1eb8c715a66a3d3fab95f0ac4eba2865877