Merge "Import translations. DO NOT MERGE am: 4bf388ecbd
-s ours am: 9441334fce
-s ours am: a4ec12c9d9
-s ours am: 873a7d6569
-s ours" into nyc-mr1-dev-plus-aosp
commit
dfc3a50e8a