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

Change-Id: I94947492b9487a7f8a59e74aeefe43e2a40a4534