Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: b37de73103 -s ours am: 0e5c34bb38 -s ours
am: c0addd1f5a -s ours
am skip reason: subject contains skip directive

Change-Id: I15f5e9e361edf4a6491a6e04cf70e826d91bdc53