Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: da5f0466b9 -s ours am: 12954bad1b -s ours
am: 63f9868a52 -s ours
am skip reason: subject contains skip directive

Change-Id: I0a33069be803f87752d4c9574a172460ae3d42aa