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

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 9e6eec47 -s ours am: 2279fd5f -s ours am: bbaf5721 -s ours am: 41b20f62 -s ours am: eb3c8ce6 -s ours am: bae2002e -s ours

am skip reason: subject contains skip directive

Change-Id: If9492a5f75751863618ad0cd5e3c4c606c8ae535