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

Change-Id: Ia4f46d8b32b0158ffb8f3861399a6bd36f0d4275