Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 7604e64ecc
-s ours am: 48fd3d016a
-s ours am: a68bdf59af
-s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp
commit
bc508606fc