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

* commit 'cb4bea3ae8d76b54b0d54c8ae51dd2ef7f64bbfe':
  Import translations. DO NOT MERGE

Change-Id: Ia24ecde1804a2478505923121cedf9550924752a