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

Change-Id: Ie870b3e660e929d8737dd04cb8a5431f26edc945