Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: fe2d421fab -s ours am: 5c0d577dea -s ours am: 3fa31fb1cf -s ours
am: 3df86ce4fc -s ours
am skip reason: subject contains skip directive

Change-Id: I50522a70be353869689ee8a4dd7684ccbe0f7214