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

Change-Id: I0b994052232b5b9d0c8a2e7831405b46154b666f