Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: e0c262b7da -s ours am: c05f11a0b6 -s ours
am: b8344d6d40 -s ours
am skip reason: subject contains skip directive

Change-Id: If8b07235096e290994721d5e6e3a445d15243a00