Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 3b7a08e360 -s ours am: 843ab671ab -s ours
am: 32ca058035 -s ours
am skip reason: subject contains skip directive

Change-Id: I6a7bc76788bca5a568e3cb6a42dd9555d4d145ea