Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into...

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 801d1779 -s ours am: da046065 -s ours am: 34f88bfe -s ours
am: 9dce775b -s ours
am skip reason: subject contains skip directive

Change-Id: I94159f23537687f86ae3d41ba7689e9b09ebd507