Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: da5f0466b9 -s ours am: db576284b5 -s ours
am: 27c3f58388 -s ours
am skip reason: subject contains skip directive

Change-Id: I4a833d7240b6ef48f155a6bf0223ce9f261084b8