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

Change-Id: I3ec16b4d70ea19d760d5f29e54518299bf65e621