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

Change-Id: I16bce000ecf7e9bed77e82ef1bc9d51d4929a055