Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 801d177995 -s ours am: b87c62f388 -s ours am: 585f5f228c -s ours
am: 6db6f37674 -s ours
am skip reason: subject contains skip directive

Change-Id: I9bbd61ecd1577161fc446c2f00205a545d4fd8a1