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

Change-Id: I04e50284b8b8a57d16dd2e66d88af826bac3afc6