Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 2f5007db0a -s ours am: 7fd9a81f83 -s ours
am: 506d74247a -s ours
am skip reason: subject contains skip directive

Change-Id: I7c9d7f471ea5f8992dd1a7810b5390d3bfaf7b14