Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 8931739c16 -s ours am: a6e7345636 -s ours am: e8b96c4515 -s ours
am: 8b5ab1e375 -s ours
am skip reason: subject contains skip directive

Change-Id: Id032698a563e64a45ed3ba1d29cd829c7882425e