[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 6018662e18  -s ours
am: 04fa32edbf  -s ours

Change-Id: I5fb5a8842b69eb0f435515d7c7ff895ecc25c84f