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

Change-Id: Iba9e9a670a5c1d386366daa30436ca23e2138bdd