Import translations. DO NOT MERGE am: d17b51efaa
-s ours am: 2a925946a9
-s ours
am: 91fa22a23f
-s ours
Change-Id: I3c7b3236cb7b7c34d5522f97129f9b2c0b57a489
main
commit
a79921d014