Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: c26bc89520 -s ours am: 3c3317af36 -s ours
am: 97916f9e67 -s ours
am skip reason: subject contains skip directive

Change-Id: If4d9d05d3bbc07829deb0a039b68d5510ce4fc76