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

Change-Id: I6cea2b032629810b13efba6e2efb18ba2e1e7b0f