[automerger skipped] Merge "Import translations. DO NOT MERGE" into...

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 126cf669 -s ours am: fdfb7e85 -s ours am: 45dab5e1 -s ours am: afebfcdb -s ours am: 6508d4d9 -s ours am: ec288967 -s ours

am skip reason: subject contains skip directive

Change-Id: I956898f64e24bd661599ccdde009ddd542580215