Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: cc13f9ed66 -s ours am: 4c20c8c114 -s ours
am: 49377c15f0 -s ours
am skip reason: subject contains skip directive

Change-Id: I25482f70f8c596f7df1ee4f69e3153e0dc7799f9