Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 732a35eb23
-s ours am: f107987432
-s ours" into nyc-mr1-dev-plus-aosp
commit
bb346a929f