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

Change-Id: I8e8e84b88013ae2c470e9c87c575cfa1fe029391