Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: ab6ef4f0df -s ours am: 6a4598d617 -s ours
am: 07814412e6 -s ours
am skip reason: subject contains skip directive

Change-Id: If8fecc13cf911b0850a5cff71b74e49fc603f433