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

Change-Id: Ib2c63b3dd300cc8fd2375f8d49ca3740cd87eaca