Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 8990b8c29c  -s ours

Change-Id: Iad921d79917548c8f38f68b78a6b09c84eff0cec