Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 93f97c07f6
-s ours am: 6ed0a2869f
-s ours" into nyc-mr1-dev-plus-aosp
commit
2246035952