Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 6f1fc7fd3f -s ours am: 4cad3ceff8 -s ours
am: 299fe08e17 -s ours
am skip reason: subject contains skip directive

Change-Id: I8d403d39d416db68e3b555d5db6da115b5e635e9