Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 8d1c17d2ad
-s ours am: fde28ca6e5
-s ours
am: d00e82f3a1
-s ours
Change-Id: I468942b591be508e6839a354e704119686141b53
main
commit
6b2e74a4e5