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

Change-Id: I1cbd22f6b7c0186627d62cd24f2b9d6626d62452