Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 83b7531e1b -s ours am: 5621f5b11c -s ours
am: d6947882d7 -s ours
am skip reason: subject contains skip directive

Change-Id: I41950cdd20fd10c8ca9ac7e89b9d6246f2be2e02