Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: a62d335d5b
-s ours am: 060ce29db5
-s ours" into nyc-mr1-dev-plus-aosp
commit
08bc0752bb