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

Change-Id: I06fa6c98d7f69830fd3b1c46637990bccdb719d7