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

Change-Id: Iba0ae68b665da9e415db251702fd6478f5a7427a