Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 4ffaa9a225 -s ours am: c185e17a25 -s ours
am: 3c78aefb41 -s ours
am skip reason: subject contains skip directive

Change-Id: If6618639e9091c3c6cf958215dd8ef9fa2944b6d