Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: e9fa91113e -s ours am: c70c3a3236 -s ours am: fde82958ce -s ours
am: 0b32d74e30 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib66b021546a71cc2abec26f8674b6b2935512bc9