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

Change-Id: I4db9000bcd2d24cf34c9935ea08e3830801d5520