[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 6824fdb401  -s ours

Change-Id: If5d1795cb37afef412bec06959647fe0fb09c7e3