[automerger skipped] Import translations. DO NOT MERGE am: 46a694cd21  -s ours
am: 4f0d2a9457  -s ours

Change-Id: I22a202b4541c67273540aeff06b2b7a2632bd4a9