Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 69d1c9c037 -s ours am: d2b7ca5bad -s ours
am: 796af08abe -s ours
am skip reason: subject contains skip directive

Change-Id: If4c0c1257eb7b99f741cd88b1d1744d5a3a16331