[automerger skipped] Import translations. DO NOT MERGE am: 85c82c5681  -s ours
am: a0bfe20b35  -s ours

Change-Id: Ifcf837e01890110d0015ca19fd6fa922d70d8188