Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: b7ad07adad -s ours am: 7002e2a912 -s ours
am: e6495d4830 -s ours
am skip reason: subject contains skip directive

Change-Id: I514e2f0dfda041042ed79496bcc49afe0e4d603b