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

Change-Id: Ibdde1601bfe4b890a5f904b89715a672a9df94ca