[automerger skipped] Import translations. DO NOT MERGE am: 67efbc844c  -s ours
am: de676d6315  -s ours

Change-Id: I136bb221a0ef452bd6791a22d72f750500f29fd8