Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 91d2a1cc28 -s ours am: 3bdace4623 -s ours
am: 84d6a97c0e -s ours
am skip reason: subject contains skip directive

Change-Id: I6e978cc5627b22fe082470aba194c484b766d74d