Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: 740ddc38bc  -s ours

Change-Id: I967c516afc18ee97b2790cedd4747e8f93c57368