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

Change-Id: Iad522c9d9198d2ce7d219806704019cde43176f8