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

Change-Id: I8e35329f84fabff4af7590f9896aeb4110fd2067