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

Change-Id: Id991a9063f46c83efe08ae84d2a4b904cba7b725