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

Change-Id: Icbc87369e35c1ddc2c03e359a6a7e13f2d6b9532