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

Change-Id: I52fa538e33668796e4c60f3f301eabaf1c449675