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

Change-Id: I5ee9acf1a7af97b3d8400cd6b9cc6eed3d1065c6