[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 8f67a3867c  -s ours
am: e3e686492c  -s ours

Change-Id: Ib142b7a688ece06a24b89658de159db4aa855e7e