Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 033d7caf95 -s ours am: e19836acd5 -s ours
am: ea2e73115c -s ours
am skip reason: subject contains skip directive

Change-Id: I1863d4346dc1323d2015ac75f70d357a44531d82