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

Change-Id: I030d826db98ad90f3dd6925718fdcf914b3e1a56