Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 433e625341 -s ours am: 3e9da03d0c -s ours
am: f6311a88da -s ours
am skip reason: subject contains skip directive

Change-Id: I503026bcf5eb543ad7733da3cc0dabe1f6a2a399