Import translations. DO NOT MERGE am: 9234d88740
-s ours
am: e75020ebb4
-s ours
* commit 'e75020ebb4d44d6c3b4e61a9ee555d707e0ede62':
Change-Id: I11323df638ffc806163c179ea25da5ba76c0ad7a
main
commit
055203fb0f