Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: ab46c2ff33 -s ours am: d61e6b5090 -s ours
am: 0c9c6226ed -s ours
am skip reason: subject contains skip directive

Change-Id: I2053fa0858c71d055f425b39b1988400dba49b70