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

Change-Id: I77ba601e7a1903ca33d4a1e3b46a7be63e8d61b3