Import translations. DO NOT MERGE am: 5062034c28
-s ours am: 0de320c5c0
-s ours
am: 10362dda16
-s ours
Change-Id: I69991570d2517e6b8e1141fd89c292032aca2d1b
main
commit
3379248ac8