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

Change-Id: I0e2f28e8b38f227e5f208ac55ee85e962f950a20