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

Change-Id: I49d474ed5e182d47e46acdae5ce9705919899061