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

Change-Id: Ia16325ebec947b691efd088a45879d8033430355