Merge "Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: e2529357e8 -s ours am: c5252e3523 -s ours
am: b51ed970f0 -s ours
am skip reason: subject contains skip directive

Change-Id: I7fdd4ee60dd56b867d604f902a02af9316cabc79