Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 1f6fbcdef3 -s ours am: 2264e1ce5e -s ours
am: 10eba2aef3 -s ours
am skip reason: subject contains skip directive

Change-Id: Ia4f042de5e2fa3133372e0d06fbd42152a99c67d