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

Change-Id: I53ac7a4e20798487379f8486eb81c6b72d529da5