Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: ab5629ef3c -s ours am: f09d1c3a28 -s ours
am: 41c30ca8f2 -s ours
am skip reason: subject contains skip directive

Change-Id: I81030e95d4c9a5d28d7d955fb756861b2ec9323b