Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 6aa3f38983 -s ours am: 21fd281430 -s ours
am: 515271697b -s ours
am skip reason: subject contains skip directive

Change-Id: I51f65aed52f0eea954249ec3836babe93cfff913