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

Change-Id: I55417fc18f2ce2ced26dc8399f38bcb7770661df