[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 43fbd8f5ab  -s ours
am: 62e971732c  -s ours

Change-Id: I34b2a2aab25f45f76666b336ace01db5ff21ac4b