Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: c38c7db007 -s ours am: fc1a356a87 -s ours
am: 33ace072b1 -s ours
am skip reason: subject contains skip directive

Change-Id: I9c5b0f4921c8dcd90651409b797ce369fab4f8f6