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

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 8d68c166 -s ours am: 8102c955 -s ours am: 042ae8db -s ours am: 440d5fb6 -s ours am: 1f512113 -s ours am: 4bdcd938 -s ours

am skip reason: subject contains skip directive

Change-Id: Iadd0dbe9b978f221e6eb7ae711d2554c1bb88076