Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 6c71f54f82
-s ours
am: d8b2e4e5bd
-s ours
* commit 'd8b2e4e5bd0294a2901b0c2e3f7b1f9fff62e47c':
Import translations. DO NOT MERGE
main
commit
79a776f242