[automerger skipped] Import translations. DO NOT MERGE
am: 28d6f81665  -s ours

Change-Id: I74418f13916d2a22f66ec2ef940ac9457ef4f049