[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 895f1c1032 -s ours
am skip reason: subject contains skip directive

Change-Id: I78a17b7ef9e97b76874def995894674bd4b1199f