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

Change-Id: I3ab4a914d7209cfe4e143bb3268f9f4710d2c8bf