Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 8292b6bb44 -s ours am: b0d1548ece -s ours
am: d0353c05da -s ours
am skip reason: subject contains skip directive

Change-Id: I2e09e797b89c6232679f358df5ec3e6050dbf265