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

Change-Id: I73a89426c35da915533bffa7e1fb530c880ffdda