Import translations. DO NOT MERGE am: 610e87310e
-s ours
am: 7944bf983a
-s ours
* commit '7944bf983a1383717fafe1103ae05116d24c28c3':
Change-Id: Ifd8e6c7d08f2f1f9482c54e570ecb12746331627
main
commit
995713eae7