Import translations. DO NOT MERGE
am: ef89f62670  -s ours

Change-Id: I7e16f16bf5fbec60c9f1258cf1cd139c3e04377b