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

Change-Id: I6f8418da46b6455ee31dd2969844f9851aa555ba