Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 9ea1842c38 -s ours am: 5e26e1d81c -s ours
am: d648b70eca -s ours
am skip reason: subject contains skip directive

Change-Id: I5b8cb08f8ccc7592e4e5811868a216b39ee53074