Import translations. DO NOT MERGE am: 4bf388ecbd
-s ours am: 9441334fce
-s ours
am: 7910ade9dd
-s ours
Change-Id: Ia4292c9b71d2cad23558da774bca7b163881175a
main
commit
2fc11ea2a9