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

Change-Id: I14e5d966b8c80f2fcd183caac830f58be76f2611