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

Change-Id: I2375f4bd2f36190b80429b32fc12db61407df2eb