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

Change-Id: If6ea57aa1f74654037c92baa925a8658d2c02be7