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

Change-Id: I7bfcbfb1f9769c0beae7b41beb5ee6854f30df06