Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: c000487154 -s ours am: d1809212c4 -s ours
am: 12258e0a31 -s ours
am skip reason: subject contains skip directive

Change-Id: I81403bfb96618721d760fc9bae8226743c814c10