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

Change-Id: I60985b890f573bcbc7ca7ed2fba79a04c2002852