[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 063ead3e1f  -s ours
am: d24a2fd115  -s ours

Change-Id: Idb3c2f8e6217c5b43e041ecf956aa13c50644f68