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

Change-Id: I23a40558abb57cee36601e59a538d0e80e6ef0d1