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

Change-Id: Ie3baeae1b842ef2ddd449b31da658662113695c0