Import translations. DO NOT MERGE am: ff4edea1aa
-s ours am: 2c47ce5160
-s ours
am: 646984936c
-s ours
Change-Id: I6e26b862ed575c093dab3528d3839f39568a503e
main
commit
1634a0a066