Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 3ca8c70e38 -s ours am: 2a6dabcd6a -s ours
am: 80940c8826 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib0ac478c71e05a3546e652d49fe3b7bf714b97db