Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: b3b93d72fb -s ours am: b5b893485e -s ours
am: 57a1500698 -s ours
am skip reason: subject contains skip directive

Change-Id: Idf56078cdbcdeed5f6bb35a8f4da18ddd0c7ac17