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

Change-Id: Ie34b01fa17b6f7cbef730715ab7be296d5b637cf