Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: e0c262b7da -s ours am: 067f9816b1 -s ours
am: 619b9befbb -s ours
am skip reason: subject contains skip directive

Change-Id: I8331b39a6038a579c1e557c8d9c42bc8c0e283ed