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

Change-Id: I6da3efc5551a2e7c3d6077588e1529366620f26f