Import translations. DO NOT MERGE am: 82eff79103
-s ours am: 69ca405545
-s ours
am: 4f2e73cd62
-s ours
Change-Id: I59222b09163992252c94bb23025542b8bc4e2b51
This commit is contained in: